diff options
author | Praveen Kumar <praveen.kumar@windriver.com> | 2025-05-15 11:41:05 +0530 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2025-05-23 08:42:33 -0700 |
commit | c413376afc1a44da316fc86e64434368fff59158 (patch) | |
tree | c2c423d27dbc9989d340d3a80efb33f02d60cbaa | |
parent | ea026b8c9819034aae79995be26f4919c1989c71 (diff) | |
download | poky-c413376afc1a44da316fc86e64434368fff59158.tar.gz |
connman :fix CVE-2025-32366
In ConnMan through 1.44, parse_rr in dnsproxy.c has a memcpy length
that depends on an RR RDLENGTH value, i.e., *rdlen=ntohs(rr->rdlen)
and memcpy(response+offset,*end,*rdlen) without a check for whether
the sum of *end and *rdlen exceeds max. Consequently, *rdlen may be
larger than the amount of remaining packet data in the current state
of parsing. Values of stack memory locations may be sent over the
network in a response.
Reference:
https://nvd.nist.gov/vuln/detail/CVE-2025-32366
Upstream-patch:
https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=8d3be0285f1d4667bfe85dba555c663eb3d704b4
(From OE-Core rev: 1c908b1c44a006b6707a1f0da59781a6750cf8ce)
Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-connectivity/connman/connman/CVE-2025-32366.patch | 41 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman_1.43.bb | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/connman/connman/CVE-2025-32366.patch b/meta/recipes-connectivity/connman/connman/CVE-2025-32366.patch new file mode 100644 index 0000000000..62f07e707a --- /dev/null +++ b/meta/recipes-connectivity/connman/connman/CVE-2025-32366.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 8d3be0285f1d4667bfe85dba555c663eb3d704b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yoonje Shin <ioerts@kookmin.ac.kr> | ||
3 | Date: Mon, 12 May 2025 10:48:18 +0200 | ||
4 | Subject: [PATCH] dnsproxy: Address CVE-2025-32366 vulnerability | ||
5 | |||
6 | In Connman parse_rr in dnsproxy.c has a memcpy length | ||
7 | that depends on an RR RDLENGTH value (i.e., *rdlen=ntohs(rr->rdlen) | ||
8 | and memcpy(response+offset,*end,*rdlen)). Here, rdlen may be larger | ||
9 | than the amount of remaining packet data in the current state of | ||
10 | parsing. As a result, values of stack memory locations may be sent | ||
11 | over the network in a response. | ||
12 | |||
13 | This patch adds a check to ensure that (*end + *rdlen) does not exceed | ||
14 | the valid range. If the condition is violated, the function returns | ||
15 | -EINVAL. | ||
16 | |||
17 | CVE: CVE-2025-32366 | ||
18 | |||
19 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=8d3be0285f1d4667bfe85dba555c663eb3d704b4] | ||
20 | |||
21 | Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com> | ||
22 | --- | ||
23 | src/dnsproxy.c | 3 +++ | ||
24 | 1 file changed, 3 insertions(+) | ||
25 | |||
26 | diff --git a/src/dnsproxy.c b/src/dnsproxy.c | ||
27 | index 7ee26d9..1dd2f7f 100644 | ||
28 | --- a/src/dnsproxy.c | ||
29 | +++ b/src/dnsproxy.c | ||
30 | @@ -998,6 +998,9 @@ static int parse_rr(const unsigned char *buf, const unsigned char *start, | ||
31 | if ((offset + *rdlen) > *response_size) | ||
32 | return -ENOBUFS; | ||
33 | |||
34 | + if ((*end + *rdlen) > max) | ||
35 | + return -EINVAL; | ||
36 | + | ||
37 | memcpy(response + offset, *end, *rdlen); | ||
38 | |||
39 | *end += *rdlen; | ||
40 | -- | ||
41 | 2.40.0 | ||
diff --git a/meta/recipes-connectivity/connman/connman_1.43.bb b/meta/recipes-connectivity/connman/connman_1.43.bb index 02abda568f..936e880c06 100644 --- a/meta/recipes-connectivity/connman/connman_1.43.bb +++ b/meta/recipes-connectivity/connman/connman_1.43.bb | |||
@@ -7,6 +7,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ | |||
7 | file://no-version-scripts.patch \ | 7 | file://no-version-scripts.patch \ |
8 | file://0002-resolve-musl-does-not-implement-res_ninit.patch \ | 8 | file://0002-resolve-musl-does-not-implement-res_ninit.patch \ |
9 | file://CVE-2025-32743.patch \ | 9 | file://CVE-2025-32743.patch \ |
10 | file://CVE-2025-32366.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | 13 | ||