diff mbox series

[scarthgap] dhcpcd: patch CVE-2025-70102

Message ID 20261023182346.52542-1-peter.marko@siemens.com
State New
Headers show
Series [scarthgap] dhcpcd: patch CVE-2025-70102 | expand

Commit Message

Peter Marko Oct. 23, 2026, 6:23 p.m. UTC 
From: Peter Marko <peter.marko@siemens.com>

Pick patch per [1].

[1] https://security-tracker.debian.org/tracker/CVE-2025-70102

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 .../dhcpcd/dhcpcd_10.0.6.bb                   |  1 +
 .../dhcpcd/files/CVE-2025-70102.patch         | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-connectivity/dhcpcd/files/CVE-2025-70102.patch
diff mbox series

Patch

diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb
index e6854e1c7f2..029040a2236 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb
@@ -18,6 +18,7 @@  SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma
            file://CVE-2026-56113.patch \
            file://CVE-2026-56114.patch \
            file://CVE-2026-56117.patch \
+           file://CVE-2025-70102.patch \
            "
 
 SRCREV = "1c8ae59836fa87b4c63c598087f0460ec20ed862"
diff --git a/meta/recipes-connectivity/dhcpcd/files/CVE-2025-70102.patch b/meta/recipes-connectivity/dhcpcd/files/CVE-2025-70102.patch
new file mode 100644
index 00000000000..e2b0e291f9c
--- /dev/null
+++ b/meta/recipes-connectivity/dhcpcd/files/CVE-2025-70102.patch
@@ -0,0 +1,30 @@ 
+From 117742d755b591764036dd4218f314f748a3d2b7 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Sun, 21 Dec 2025 08:31:52 +0000
+Subject: [PATCH] options: Ensure ldop is not NULL dereferenced (#568)
+
+ldop itself cannot be non NULL as it points to the location.
+but *ldop CAN be NULL.
+
+Fixes #567.
+
+CVE: CVE-2025-70102
+Upstream-Status: Backport [https://github.com/NetworkConfiguration/dhcpcd/commit/117742d755b591764036dd4218f314f748a3d2b7]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ src/if-options.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/if-options.c b/src/if-options.c
+index 083449b9..9ac9f0b8 100644
+--- a/src/if-options.c
++++ b/src/if-options.c
+@@ -1882,7 +1882,7 @@ err_sla:
+ 			if (*edop) {
+ 				dop = &(*edop)->embopts;
+ 				dop_len = &(*edop)->embopts_len;
+-			} else if (ldop) {
++			} else if (*ldop) {
+ 				dop = &(*ldop)->embopts;
+ 				dop_len = &(*ldop)->embopts_len;
+ 			} else {