Skip to content

Commit 7a4ea5f

Browse files
committed
patches: Apply iio bmi323 change to arm64 and arm64-fixes tree
The arm64 development tree is typically based on -rc3 but this change did not get merged until 6.12-rc4, so it is needed to avoid disabling CONFIG_WERROR for this tree. arm64-fixes is currently based on -rc1, so apply this change for the same reason, but it may be able to be dropped sooner. Signed-off-by: Nathan Chancellor <[email protected]>
1 parent f5cc646 commit 7a4ea5f

File tree

4 files changed

+124
-0
lines changed

4 files changed

+124
-0
lines changed
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
From 506a1ac4c4464a61e4336e135841067dbc040aaa Mon Sep 17 00:00:00 2001
2+
From: Dan Carpenter <[email protected]>
3+
Date: Mon, 16 Sep 2024 17:09:10 +0300
4+
Subject: iio: bmi323: fix copy and paste bugs in suspend resume
5+
6+
This code is using bmi323_reg_savestate[] and ->reg_settings[] instead
7+
of bmi323_ext_reg_savestate[] and ->ext_reg_settings[]. This was
8+
discovered by Smatch:
9+
10+
drivers/iio/imu/bmi323/bmi323_core.c:2202 bmi323_core_runtime_suspend()
11+
error: buffer overflow 'bmi323_reg_savestate' 9 <= 11
12+
13+
Fixes: 16531118ba63 ("iio: bmi323: peripheral in lowest power state on suspend")
14+
Signed-off-by: Dan Carpenter <[email protected]>
15+
Link: https://patch.msgid.link/[email protected]
16+
Signed-off-by: Jonathan Cameron <[email protected]>
17+
---
18+
Link: https://git.kernel.org/linus/506a1ac4c4464a61e4336e135841067dbc040aaa
19+
---
20+
drivers/iio/imu/bmi323/bmi323_core.c | 12 ++++++------
21+
1 file changed, 6 insertions(+), 6 deletions(-)
22+
23+
diff --git a/drivers/iio/imu/bmi323/bmi323_core.c b/drivers/iio/imu/bmi323/bmi323_core.c
24+
index 1d1405d37c5adb..c953501c2a7559 100644
25+
--- a/drivers/iio/imu/bmi323/bmi323_core.c
26+
+++ b/drivers/iio/imu/bmi323/bmi323_core.c
27+
@@ -2198,12 +2198,12 @@ static int bmi323_core_runtime_suspend(struct device *dev)
28+
}
29+
30+
for (unsigned int i = 0; i < ARRAY_SIZE(bmi323_ext_reg_savestate); i++) {
31+
- ret = bmi323_read_ext_reg(data, bmi323_reg_savestate[i],
32+
- &savestate->reg_settings[i]);
33+
+ ret = bmi323_read_ext_reg(data, bmi323_ext_reg_savestate[i],
34+
+ &savestate->ext_reg_settings[i]);
35+
if (ret) {
36+
dev_err(data->dev,
37+
"Error reading bmi323 external reg 0x%x: %d\n",
38+
- bmi323_reg_savestate[i], ret);
39+
+ bmi323_ext_reg_savestate[i], ret);
40+
return ret;
41+
}
42+
}
43+
@@ -2242,12 +2242,12 @@ static int bmi323_core_runtime_resume(struct device *dev)
44+
}
45+
46+
for (unsigned int i = 0; i < ARRAY_SIZE(bmi323_ext_reg_savestate); i++) {
47+
- ret = bmi323_write_ext_reg(data, bmi323_reg_savestate[i],
48+
- savestate->reg_settings[i]);
49+
+ ret = bmi323_write_ext_reg(data, bmi323_ext_reg_savestate[i],
50+
+ savestate->ext_reg_settings[i]);
51+
if (ret) {
52+
dev_err(data->dev,
53+
"Error writing bmi323 external reg 0x%x: %d\n",
54+
- bmi323_reg_savestate[i], ret);
55+
+ bmi323_ext_reg_savestate[i], ret);
56+
return ret;
57+
}
58+
}
59+
--
60+
cgit 1.2.3-korg
61+

patches/arm64-fixes/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
506a1ac4c4464a61e4336e135841067dbc040aaa.patch
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
From 506a1ac4c4464a61e4336e135841067dbc040aaa Mon Sep 17 00:00:00 2001
2+
From: Dan Carpenter <[email protected]>
3+
Date: Mon, 16 Sep 2024 17:09:10 +0300
4+
Subject: iio: bmi323: fix copy and paste bugs in suspend resume
5+
6+
This code is using bmi323_reg_savestate[] and ->reg_settings[] instead
7+
of bmi323_ext_reg_savestate[] and ->ext_reg_settings[]. This was
8+
discovered by Smatch:
9+
10+
drivers/iio/imu/bmi323/bmi323_core.c:2202 bmi323_core_runtime_suspend()
11+
error: buffer overflow 'bmi323_reg_savestate' 9 <= 11
12+
13+
Fixes: 16531118ba63 ("iio: bmi323: peripheral in lowest power state on suspend")
14+
Signed-off-by: Dan Carpenter <[email protected]>
15+
Link: https://patch.msgid.link/[email protected]
16+
Signed-off-by: Jonathan Cameron <[email protected]>
17+
---
18+
Link: https://git.kernel.org/linus/506a1ac4c4464a61e4336e135841067dbc040aaa
19+
---
20+
drivers/iio/imu/bmi323/bmi323_core.c | 12 ++++++------
21+
1 file changed, 6 insertions(+), 6 deletions(-)
22+
23+
diff --git a/drivers/iio/imu/bmi323/bmi323_core.c b/drivers/iio/imu/bmi323/bmi323_core.c
24+
index 1d1405d37c5adb..c953501c2a7559 100644
25+
--- a/drivers/iio/imu/bmi323/bmi323_core.c
26+
+++ b/drivers/iio/imu/bmi323/bmi323_core.c
27+
@@ -2198,12 +2198,12 @@ static int bmi323_core_runtime_suspend(struct device *dev)
28+
}
29+
30+
for (unsigned int i = 0; i < ARRAY_SIZE(bmi323_ext_reg_savestate); i++) {
31+
- ret = bmi323_read_ext_reg(data, bmi323_reg_savestate[i],
32+
- &savestate->reg_settings[i]);
33+
+ ret = bmi323_read_ext_reg(data, bmi323_ext_reg_savestate[i],
34+
+ &savestate->ext_reg_settings[i]);
35+
if (ret) {
36+
dev_err(data->dev,
37+
"Error reading bmi323 external reg 0x%x: %d\n",
38+
- bmi323_reg_savestate[i], ret);
39+
+ bmi323_ext_reg_savestate[i], ret);
40+
return ret;
41+
}
42+
}
43+
@@ -2242,12 +2242,12 @@ static int bmi323_core_runtime_resume(struct device *dev)
44+
}
45+
46+
for (unsigned int i = 0; i < ARRAY_SIZE(bmi323_ext_reg_savestate); i++) {
47+
- ret = bmi323_write_ext_reg(data, bmi323_reg_savestate[i],
48+
- savestate->reg_settings[i]);
49+
+ ret = bmi323_write_ext_reg(data, bmi323_ext_reg_savestate[i],
50+
+ savestate->ext_reg_settings[i]);
51+
if (ret) {
52+
dev_err(data->dev,
53+
"Error writing bmi323 external reg 0x%x: %d\n",
54+
- bmi323_reg_savestate[i], ret);
55+
+ bmi323_ext_reg_savestate[i], ret);
56+
return ret;
57+
}
58+
}
59+
--
60+
cgit 1.2.3-korg
61+

patches/arm64/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
506a1ac4c4464a61e4336e135841067dbc040aaa.patch

0 commit comments

Comments
 (0)