[PATCH v3 6/9] IOMUX: Preserve console list if realloc() fails
Andy Shevchenko
andriy.shevchenko at linux.intel.com
Mon Dec 21 13:30:05 CET 2020
It's realloc() 101 to avoid `foo = realloc(foo, ...);` call
due to getting a memory leak.
Actually it's not clear why realloc() has been used here.
If we shrink the array, the memcpy() overwrites it anyway
with the contents of a new array. If it becomes bigger,
same story.
Drop useless realloc() for good and thus preserve console list
in case of failed allocation.
Fixes: 16a28ef219c2 ("IOMUX: Add console multiplexing support.")
Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
Reviewed-by: Simon Glass <sjg at chromium.org>
---
v3: added tag
common/iomux.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/common/iomux.c b/common/iomux.c
index e1bd1b48cd03..7b7b063cfc6b 100644
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -129,19 +129,10 @@ int iomux_doenv(const int console, const char *arg)
return 1;
} else {
/* Works even if console_devices[console] is NULL. */
- console_devices[console] =
- (struct stdio_dev **)realloc(console_devices[console],
- cs_idx * sizeof(struct stdio_dev *));
- if (console_devices[console] == NULL) {
- free(cons_set);
- return 1;
- }
- memcpy(console_devices[console], cons_set, cs_idx *
- sizeof(struct stdio_dev *));
-
+ free(console_devices[console]);
+ console_devices[console] = cons_set;
cd_count[console] = cs_idx;
}
- free(cons_set);
return 0;
}
#endif /* CONSOLE_MUX */
--
2.29.2
More information about the U-Boot
mailing list