Skip to contentSkip to conversation

IOMUX: Fix access past end of console_devices

PATCH In review Sean Anderson 3 participants 3 messages Apr 6, 2022 – Apr 20, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 IOMUX: Fix access past end of console_devices

We should only access console_devices[file][i] once we have checked that i < cd_count[file]. Otherwise, we will access uninitialized memory at the end of the loop. console_devices[file][i] should not be NULL, but putting the assignment in the loop condition allows us to ensure that i is checked beforehand. This isn't a bug, but it does make valgrind stop complaining.

Fixes 400797cad3 ("IOMUX: Split out for_each_console_dev() helper macro")

---

Changes in v2:
- Put each clause of the for loop on its own line

 include/iomux.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
include/iomux.h +4 -4
index 37f5f6dee6..35caa697eb 100644
@@ -24,10 +24,10 @@ extern struct stdio_dev **console_devices[MAX_FILES];
  */
 extern int cd_count[MAX_FILES];
 
-#define for_each_console_dev(i, file, dev)		\
-	for (i = 0, dev = console_devices[file][i];	\
-	     i < cd_count[file];			\
-	     i++, dev = console_devices[file][i])
+#define for_each_console_dev(i, file, dev)				\
+	for (i = 0;							\
+	     i < cd_count[file] && (dev = console_devices[file][i]);	\
+	     i++)
 
 int iomux_match_device(struct stdio_dev **, const int, struct stdio_dev *);
 int iomux_doenv(const int, const char *);
Signature · 1 line
2.35.1
Acked-by on v2 1/1
#1 lore raw
Quoted 5 lines · Sean Anderson

We should only access console_devices[file][i] once we have checked that i < cd_count[file]. Otherwise, we will access uninitialized memory at the end of the loop. console_devices[file][i] should not be NULL, but putting the assignment in the loop condition allows us to ensure that i is checked beforehand. This isn't a bug, but it does make valgrind stop complaining.

Quoted 33 lines
Fixes 400797cad3 ("IOMUX: Split out for_each_console_dev() helper macro")

---

Changes in v2:
- Put each clause of the for loop on its own line

 include/iomux.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
include/iomux.h +4 -4
index 37f5f6dee6..35caa697eb 100644
@@ -24,10 +24,10 @@ extern struct stdio_dev **console_devices[MAX_FILES];
  */
 extern int cd_count[MAX_FILES];
 
-#define for_each_console_dev(i, file, dev)		\
-	for (i = 0, dev = console_devices[file][i];	\
-	     i < cd_count[file];			\
-	     i++, dev = console_devices[file][i])
+#define for_each_console_dev(i, file, dev)				\
+	for (i = 0;							\
+	     i < cd_count[file] && (dev = console_devices[file][i]);	\
+	     i++)
 
 int iomux_match_device(struct stdio_dev **, const int, struct stdio_dev *);
 int iomux_doenv(const int, const char *);
Signature · 1 line
2.35.1
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
In reply to Sean Anderson
Quoted 10 lines · Sean Anderson

We should only access console_devices[file][i] once we have checked that i < cd_count[file]. Otherwise, we will access uninitialized memory at the end of the loop. console_devices[file][i] should not be NULL, but putting the assignment in the loop condition allows us to ensure that i is checked beforehand. This isn't a bug, but it does make valgrind stop complaining.

Fixes 400797cad3 ("IOMUX: Split out for_each_console_dev() helper macro")

Applied to u-boot/master, thanks!

Signature · 1 line
Tom