From: Wang Mingyu Date: Fri, 13 Oct 2023 08:56:31 +0000 (+0800) Subject: dhcpcd: upgrade 10.0.2 -> 10.0.3 X-Git-Tag: yocto-5.2~4841 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fcb9ac0f1c6cac0841d7b7a29b7180c4c580920f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git dhcpcd: upgrade 10.0.2 -> 10.0.3 0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch removed since it's included in 10.0.3 Changelog: =========== Do not crash on dhcpcd test run Add automated CI builds for Ubuntu, OpenBSD, FreeBSD and NetBSD dhcpcd: Fix off-by-one overflow when read() writes full BUFSIZ privsep: fix strlcpy overflow in psp_ifname ci: execute tests after successful build compat: update arc4random() to newer chacha20 based version from OpenBSD Support libcrypto for hmac and sha256 Use a local variable instead of the optind Send correct amount of used buffer for prefix exclude option compat: use OpenSSL RAND_priv_bytes() for entropy Signed-off-by: Wang Mingyu Signed-off-by: Luca Ceresoli --- diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.2.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.3.bb similarity index 94% rename from meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.2.bb rename to meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.3.bb index 0966edd1b83..cc0fb382dff 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.2.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.3.bb @@ -15,10 +15,9 @@ 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 = "d2fbde99cf2d0072016af9dfe6a77032a5a9fc30" +SRCREV = "45fb8fd8dd281d2228c7abaddff7877d27e67146" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep systemd useradd diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch deleted file mode 100644 index d4fb1737a68..00000000000 --- a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1bd8fc7d4b34f752a32709d277a897e5ad202d97 Mon Sep 17 00:00:00 2001 -From: Tobias Heider -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 ---- - 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 -