diff options
Diffstat (limited to 'poky/meta/recipes-connectivity/dhcpcd')
| -rw-r--r-- | poky/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.2.bb (renamed from poky/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.1.bb) | 3 | ||||
| -rw-r--r-- | poky/meta/recipes-connectivity/dhcpcd/files/0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch | 33 |
2 files changed, 35 insertions, 1 deletions
diff --git a/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.1.bb b/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.2.bb index de007a6e6c..0966edd1b8 100644 --- a/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.1.bb +++ b/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.2.bb @@ -15,9 +15,10 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma file://dhcpcd.service \ file://dhcpcd@.service \ file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ + file://0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch \ " -SRCREV = "5d9bf80c26b4b7dc9d8aa175d96d5a24e75b4d48" +SRCREV = "d2fbde99cf2d0072016af9dfe6a77032a5a9fc30" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep systemd useradd diff --git a/poky/meta/recipes-connectivity/dhcpcd/files/0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch b/poky/meta/recipes-connectivity/dhcpcd/files/0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch new file mode 100644 index 0000000000..d4fb1737a6 --- /dev/null +++ b/poky/meta/recipes-connectivity/dhcpcd/files/0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch @@ -0,0 +1,33 @@ +From 1bd8fc7d4b34f752a32709d277a897e5ad202d97 Mon Sep 17 00:00:00 2001 +From: Tobias Heider <tobhe@users.noreply.github.com> +Date: Tue, 15 Aug 2023 18:06:48 +0200 +Subject: [PATCH] privsep: fix strlcpy overflow in psp_ifname (#239) + +When running our Ubuntu tests with libc6 and strlcpy overflow checks +enabled we found that the wrong size is passed to strlcpy resulting +in a crash because of an overflow. + +Upstream-Status: Backport +[https://github.com/NetworkConfiguration/dhcpcd/commit/1bd8fc7d4b34f752a32709d277a897e5ad202d97] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + src/privsep.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/privsep.c b/src/privsep.c +index b11c0351..cfe54742 100644 +--- a/src/privsep.c ++++ b/src/privsep.c +@@ -1200,7 +1200,7 @@ ps_newprocess(struct dhcpcd_ctx *ctx, struct ps_id *psid) + #endif + + if (!(ctx->options & DHCPCD_MANAGER)) +- strlcpy(psp->psp_ifname, ctx->ifv[0], sizeof(psp->psp_name)); ++ strlcpy(psp->psp_ifname, ctx->ifv[0], sizeof(psp->psp_ifname)); + TAILQ_INSERT_TAIL(&ctx->ps_processes, psp, next); + return psp; + } +-- +2.25.1 + |