diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-12-21 14:30:05 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-15 14:38:00 -0500 |
| commit | 1f8e6985db8e1eb25a8644102216c9cd5174b7a3 (patch) | |
| tree | 383fd11cf3893ef8ab99291e4bac9467c8261981 | |
| parent | ae69738d3b311d285db83fde37c0eaa2b7b6c2b4 (diff) | |
| download | u-boot-1f8e6985db8e1eb25a8644102216c9cd5174b7a3.tar.gz u-boot-1f8e6985db8e1eb25a8644102216c9cd5174b7a3.tar.xz u-boot-1f8e6985db8e1eb25a8644102216c9cd5174b7a3.zip | |
IOMUX: Preserve console list if realloc() fails
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@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/iomux.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/common/iomux.c b/common/iomux.c index e1bd1b48cd..7b7b063cfc 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 */ |