mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 07:30:26 +09:00
1f8e6985db
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: 16a28ef219 ("IOMUX: Add console multiplexing support.")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
139 lines
2.9 KiB
C
139 lines
2.9 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2008
|
|
* Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de.
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <console.h>
|
|
#include <serial.h>
|
|
#include <malloc.h>
|
|
|
|
#if CONFIG_IS_ENABLED(CONSOLE_MUX)
|
|
void iomux_printdevs(const int console)
|
|
{
|
|
int i;
|
|
struct stdio_dev *dev;
|
|
|
|
for (i = 0; i < cd_count[console]; i++) {
|
|
dev = console_devices[console][i];
|
|
printf("%s ", dev->name);
|
|
}
|
|
printf("\n");
|
|
}
|
|
|
|
/* This tries to preserve the old list if an error occurs. */
|
|
int iomux_doenv(const int console, const char *arg)
|
|
{
|
|
char *console_args, *temp, **start;
|
|
int i, j, k, io_flag, cs_idx, repeat;
|
|
struct stdio_dev *dev;
|
|
struct stdio_dev **cons_set;
|
|
|
|
console_args = strdup(arg);
|
|
if (console_args == NULL)
|
|
return 1;
|
|
/*
|
|
* Check whether a comma separated list of devices was
|
|
* entered and count how many devices were entered.
|
|
* The array start[] has pointers to the beginning of
|
|
* each device name (up to MAX_CONSARGS devices).
|
|
*
|
|
* Have to do this twice - once to count the number of
|
|
* commas and then again to populate start.
|
|
*/
|
|
i = 0;
|
|
temp = console_args;
|
|
for (;;) {
|
|
temp = strchr(temp, ',');
|
|
if (temp != NULL) {
|
|
i++;
|
|
temp++;
|
|
continue;
|
|
}
|
|
/* There's always one entry more than the number of commas. */
|
|
i++;
|
|
break;
|
|
}
|
|
start = (char **)malloc(i * sizeof(char *));
|
|
if (start == NULL) {
|
|
free(console_args);
|
|
return 1;
|
|
}
|
|
i = 0;
|
|
start[0] = console_args;
|
|
for (;;) {
|
|
temp = strchr(start[i++], ',');
|
|
if (temp == NULL)
|
|
break;
|
|
*temp = '\0';
|
|
start[i] = temp + 1;
|
|
}
|
|
cons_set = (struct stdio_dev **)calloc(i, sizeof(struct stdio_dev *));
|
|
if (cons_set == NULL) {
|
|
free(start);
|
|
free(console_args);
|
|
return 1;
|
|
}
|
|
|
|
switch (console) {
|
|
case stdin:
|
|
io_flag = DEV_FLAGS_INPUT;
|
|
break;
|
|
case stdout:
|
|
case stderr:
|
|
io_flag = DEV_FLAGS_OUTPUT;
|
|
break;
|
|
default:
|
|
free(start);
|
|
free(console_args);
|
|
free(cons_set);
|
|
return 1;
|
|
}
|
|
|
|
cs_idx = 0;
|
|
for (j = 0; j < i; j++) {
|
|
/*
|
|
* Check whether the device exists and is valid.
|
|
* console_assign() also calls console_search_dev(),
|
|
* but I need the pointer to the device.
|
|
*/
|
|
dev = console_search_dev(io_flag, start[j]);
|
|
if (dev == NULL)
|
|
continue;
|
|
/*
|
|
* Prevent multiple entries for a device.
|
|
*/
|
|
repeat = 0;
|
|
for (k = 0; k < cs_idx; k++) {
|
|
if (dev == cons_set[k]) {
|
|
repeat++;
|
|
break;
|
|
}
|
|
}
|
|
if (repeat)
|
|
continue;
|
|
/*
|
|
* Try assigning the specified device.
|
|
* This could screw up the console settings for apps.
|
|
*/
|
|
if (console_assign(console, start[j]) < 0)
|
|
continue;
|
|
cons_set[cs_idx++] = dev;
|
|
}
|
|
free(console_args);
|
|
free(start);
|
|
/* failed to set any console */
|
|
if (cs_idx == 0) {
|
|
free(cons_set);
|
|
return 1;
|
|
} else {
|
|
/* Works even if console_devices[console] is NULL. */
|
|
free(console_devices[console]);
|
|
console_devices[console] = cons_set;
|
|
cd_count[console] = cs_idx;
|
|
}
|
|
return 0;
|
|
}
|
|
#endif /* CONSOLE_MUX */
|