leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IOMUX: Fix access past end of console_devices

Browse Source 
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")
Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Andrew Scull <ascull@google.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
Sean Anderson 2022-04-06 14:36:35 -04:00 committed by Tom Rini
parent 24c904f309
commit 9dc775aabb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/iomux.h
View File

@ -24,10 +24,10 @@ extern struct stdio_dev **console_devices[MAX_FILES];
*/ */
extern int cd_count[MAX_FILES]; extern int cd_count[MAX_FILES];
#define for_each_console_dev(i, file, dev) \ #define for_each_console_dev(i, file, dev) \
for (i = 0, dev = console_devices[file][i]; \ for (i = 0; \
i < cd_count[file]; \ i < cd_count[file] && (dev = console_devices[file][i]); \
i++, dev = console_devices[file][i]) i++)
int iomux_match_device(struct stdio_dev **, const int, struct stdio_dev *); int iomux_match_device(struct stdio_dev **, const int, struct stdio_dev *);
int iomux_doenv(const int, const char *); int iomux_doenv(const int, const char *);