summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2025-01-19 17:37:31 +0100
committerSteve Sakoman <steve@sakoman.com>2025-01-24 07:59:38 -0800
commit30506f01404dfac174a1df9d3a47abb6ea40a3ac (patch)
tree23d30d64d7c403d6b4360052351bd32f2376ef3d
parent87143c52d67771ba181a8d37d951bf87ddb4438b (diff)
downloadpoky-30506f01404dfac174a1df9d3a47abb6ea40a3ac.tar.gz
ofono: patch CVE-2023-4232
Cherry-pick commit https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=2ff2da7ac374a790f8b2a0216bcb4e3126498225 (From OE-Core rev: 476ef12ab91aada032ea0e6acc5a0044497ace25) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-connectivity/ofono/ofono/CVE-2023-4232.patch31
-rw-r--r--meta/recipes-connectivity/ofono/ofono_2.4.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono/CVE-2023-4232.patch b/meta/recipes-connectivity/ofono/ofono/CVE-2023-4232.patch
new file mode 100644
index 0000000000..516cbf779c
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono/CVE-2023-4232.patch
@@ -0,0 +1,31 @@
1From 2ff2da7ac374a790f8b2a0216bcb4e3126498225 Mon Sep 17 00:00:00 2001
2From: "Sicelo A. Mhlongo" <absicsz@gmail.com>
3Date: Wed, 4 Dec 2024 10:18:52 +0200
4Subject: [PATCH] smsutil: check status report fits in buffer
5
6Fixes CVE-2023-4232
7
8CVE: CVE-2023-4232
9Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=2ff2da7ac374a790f8b2a0216bcb4e3126498225]
10Signed-off-by: Peter Marko <peter.marko@siemens.com>
11---
12 src/smsutil.c | 3 +++
13 1 file changed, 3 insertions(+)
14
15diff --git a/src/smsutil.c b/src/smsutil.c
16index ac89f16c..a706e26f 100644
17--- a/src/smsutil.c
18+++ b/src/smsutil.c
19@@ -1088,6 +1088,9 @@ static gboolean decode_status_report(const unsigned char *pdu, int len,
20 if ((len - offset) < expected)
21 return FALSE;
22
23+ if (expected > (int)sizeof(out->status_report.ud))
24+ return FALSE;
25+
26 memcpy(out->status_report.ud, pdu + offset, expected);
27 }
28
29--
302.30.2
31
diff --git a/meta/recipes-connectivity/ofono/ofono_2.4.bb b/meta/recipes-connectivity/ofono/ofono_2.4.bb
index 097a0e0566..a6a4852a63 100644
--- a/meta/recipes-connectivity/ofono/ofono_2.4.bb
+++ b/meta/recipes-connectivity/ofono/ofono_2.4.bb
@@ -23,6 +23,7 @@ SRC_URI = "\
23 file://CVE-2024-7546.patch \ 23 file://CVE-2024-7546.patch \
24 file://CVE-2024-7547.patch \ 24 file://CVE-2024-7547.patch \
25 file://CVE-2024-7540_CVE-2024-7541_CVE-2024-7542.patch \ 25 file://CVE-2024-7540_CVE-2024-7541_CVE-2024-7542.patch \
26 file://CVE-2023-4232.patch \
26" 27"
27SRC_URI[sha256sum] = "93580adc1afd1890dc516efb069de0c5cdfef014415256ddfb28ab172df2d11d" 28SRC_URI[sha256sum] = "93580adc1afd1890dc516efb069de0c5cdfef014415256ddfb28ab172df2d11d"
28 29