Skip to content

Commit 2513c75

Browse files
petermarkorossburton
authored andcommitted
Cherry-pick commit https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=29ff6334b492504ace101be748b256e6953d2c2f Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Ross Burton <ross.burton@arm.com>
1 parent fa24222 commit 2513c75

File tree

2 files changed

+53
-0
lines changed

2 files changed

+53
-0
lines changed
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
From 29ff6334b492504ace101be748b256e6953d2c2f Mon Sep 17 00:00:00 2001
2+
From: "Sicelo A. Mhlongo" <absicsz@gmail.com>
3+
Date: Tue, 17 Dec 2024 11:31:28 +0200
4+
Subject: [PATCH] atmodem: sms: ensure buffer is initialized before use
5+
6+
Fixes: CVE-2024-7540
7+
Fixes: CVE-2024-7541
8+
Fixes: CVE-2024-7542
9+
10+
CVE: CVE-2024-7540
11+
CVE: CVE-2024-7541
12+
CVE: CVE-2024-7542
13+
Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=29ff6334b492504ace101be748b256e6953d2c2f]
14+
Signed-off-by: Peter Marko <peter.marko@siemens.com>
15+
---
16+
drivers/atmodem/sms.c | 6 +++---
17+
1 file changed, 3 insertions(+), 3 deletions(-)
18+
19+
diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c
20+
index d994856b..0668c631 100644
21+
--- a/drivers/atmodem/sms.c
22+
+++ b/drivers/atmodem/sms.c
23+
@@ -399,7 +399,7 @@ static void at_cmt_notify(GAtResult *result, gpointer user_data)
24+
struct sms_data *data = ofono_sms_get_data(sms);
25+
GAtResultIter iter;
26+
const char *hexpdu;
27+
- unsigned char pdu[176];
28+
+ unsigned char pdu[176] = {0};
29+
long pdu_len;
30+
int tpdu_len;
31+
32+
@@ -466,7 +466,7 @@ static void at_cmgr_notify(GAtResult *result, gpointer user_data)
33+
struct sms_data *data = ofono_sms_get_data(sms);
34+
GAtResultIter iter;
35+
const char *hexpdu;
36+
- unsigned char pdu[176];
37+
+ unsigned char pdu[176] = {0};
38+
long pdu_len;
39+
int tpdu_len;
40+
41+
@@ -648,7 +648,7 @@ static void at_cmgl_notify(GAtResult *result, gpointer user_data)
42+
struct sms_data *data = ofono_sms_get_data(sms);
43+
GAtResultIter iter;
44+
const char *hexpdu;
45+
- unsigned char pdu[176];
46+
+ unsigned char pdu[176] = {0};
47+
long pdu_len;
48+
int tpdu_len;
49+
int index;
50+
--
51+
2.30.2
52+

meta/recipes-connectivity/ofono/ofono_2.14.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ SRC_URI = "\
1212
file://rmnet.patch \
1313
file://ofono \
1414
file://CVE-2024-7539.patch \
15+
file://CVE-2024-7540_CVE-2024-7541_CVE-2024-7542.patch \
1516
"
1617
SRC_URI[sha256sum] = "983cbfd5e1e1a410ba7ad2db7f50fadc91e50b29f1ede40cdc73f941da7ba95f"
1718

0 commit comments

Comments
 (0)