summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-10-13 16:56:31 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-19 13:38:57 +0100
commit88bc5439bdf711aa56eedca15e6f0253a390a3ac (patch)
treefc4f0ce49672923fffe5939cf4ec5b1a3d46e07f /meta/recipes-connectivity
parenta9b6c951bc23b55eb9e9f945aa17a838f461f25c (diff)
downloadpoky-88bc5439bdf711aa56eedca15e6f0253a390a3ac.tar.gz
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 (From OE-Core rev: fcb9ac0f1c6cac0841d7b7a29b7180c4c580920f) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.3.bb (renamed from meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.2.bb)3
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch33
2 files changed, 1 insertions, 35 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.2.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.3.bb
index 0966edd1b8..cc0fb382df 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
15 file://dhcpcd.service \ 15 file://dhcpcd.service \
16 file://dhcpcd@.service \ 16 file://dhcpcd@.service \
17 file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ 17 file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \
18 file://0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch \
19 " 18 "
20 19
21SRCREV = "d2fbde99cf2d0072016af9dfe6a77032a5a9fc30" 20SRCREV = "45fb8fd8dd281d2228c7abaddff7877d27e67146"
22S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
23 22
24inherit pkgconfig autotools-brokensep systemd useradd 23inherit 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 d4fb1737a6..0000000000
--- a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-fix-strlcpy-overflow-in-psp_ifname-239.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 1bd8fc7d4b34f752a32709d277a897e5ad202d97 Mon Sep 17 00:00:00 2001
2From: Tobias Heider <tobhe@users.noreply.github.com>
3Date: Tue, 15 Aug 2023 18:06:48 +0200
4Subject: [PATCH] privsep: fix strlcpy overflow in psp_ifname (#239)
5
6When running our Ubuntu tests with libc6 and strlcpy overflow checks
7enabled we found that the wrong size is passed to strlcpy resulting
8in a crash because of an overflow.
9
10Upstream-Status: Backport
11[https://github.com/NetworkConfiguration/dhcpcd/commit/1bd8fc7d4b34f752a32709d277a897e5ad202d97]
12
13Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
14---
15 src/privsep.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/privsep.c b/src/privsep.c
19index b11c0351..cfe54742 100644
20--- a/src/privsep.c
21+++ b/src/privsep.c
22@@ -1200,7 +1200,7 @@ ps_newprocess(struct dhcpcd_ctx *ctx, struct ps_id *psid)
23 #endif
24
25 if (!(ctx->options & DHCPCD_MANAGER))
26- strlcpy(psp->psp_ifname, ctx->ifv[0], sizeof(psp->psp_name));
27+ strlcpy(psp->psp_ifname, ctx->ifv[0], sizeof(psp->psp_ifname));
28 TAILQ_INSERT_TAIL(&ctx->ps_processes, psp, next);
29 return psp;
30 }
31--
322.25.1
33