openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

internal: Fix board vendor and model memory leaks

Browse Source 
The board vendor and model are sometimes specified as arguments during
an internal flash, so make sure they are freed at the end of
initialization.

Change-Id: I9f43708f3b075896be67acec114bc6f390f8c6ca
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Found-by: Coverity CID 1230664, 1230665
Reviewed-on: https://review.coreboot.org/c/flashrom/+/34846
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
This commit is contained in:
Jacob Garber 2019-08-12 11:14:14 -06:00 committed by Nico Huber
parent 15f539c8c9
commit 1c091d1aeb
3 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board_enable.c
View File

@ -2516,7 +2516,7 @@ int selfcheck_board_enables(void)
* Parameters vendor and model will be overwritten. Returns 0 on success. * Parameters vendor and model will be overwritten. Returns 0 on success.
* Note: strtok modifies the original string, so we work on a copy and allocate memory for the results. * Note: strtok modifies the original string, so we work on a copy and allocate memory for the results.
*/ */
int board_parse_parameter(const char *boardstring, const char **vendor, const char **model) int board_parse_parameter(const char *boardstring, char **vendor, char **model)
{ {
/* strtok may modify the original string. */ /* strtok may modify the original string. */
char *tempstr = strdup(boardstring); char *tempstr = strdup(boardstring);

47
internal.c
View File

@ -145,8 +145,8 @@ int internal_init(void)
int ret = 0; int ret = 0;
int force_laptop = 0; int force_laptop = 0;
int not_a_laptop = 0; int not_a_laptop = 0;
const char *board_vendor = NULL; char *board_vendor = NULL;
const char *board_model = NULL; char *board_model = NULL;
#if IS_X86 #if IS_X86
const char *cb_vendor = NULL; const char *cb_vendor = NULL;
const char *cb_model = NULL; const char *cb_model = NULL;
@ -210,8 +210,10 @@ int internal_init(void)
} }
free(arg); free(arg);
if (rget_io_perms()) if (rget_io_perms()) {
return 1; ret = 1;
goto internal_init_exit;
}
/* Default to Parallel/LPC/FWH flash devices. If a known host controller /* Default to Parallel/LPC/FWH flash devices. If a known host controller
* is found, the host controller init routine sets the * is found, the host controller init routine sets the
@ -219,17 +221,22 @@ int internal_init(void)
*/ */
internal_buses_supported = BUS_NONSPI; internal_buses_supported = BUS_NONSPI;
if (try_mtd() == 0) if (try_mtd() == 0) {
return 0; ret = 0;
goto internal_init_exit;
}
/* Initialize PCI access for flash enables */ /* Initialize PCI access for flash enables */
if (pci_init_common() != 0) if (pci_init_common() != 0) {
return 1; ret = 1;
goto internal_init_exit;
}
if (processor_flash_enable()) { if (processor_flash_enable()) {
msg_perr("Processor detection/init failed.\n" msg_perr("Processor detection/init failed.\n"
"Aborting.\n"); "Aborting.\n");
return 1; ret = 1;
goto internal_init_exit;
} }
#if IS_X86 #if IS_X86
@ -238,8 +245,10 @@ int internal_init(void)
msg_pwarn("Warning: The mainboard IDs set by -p internal:mainboard (%s:%s) do not\n" msg_pwarn("Warning: The mainboard IDs set by -p internal:mainboard (%s:%s) do not\n"
" match the current coreboot IDs of the mainboard (%s:%s).\n", " match the current coreboot IDs of the mainboard (%s:%s).\n",
board_vendor, board_model, cb_vendor, cb_model); board_vendor, board_model, cb_vendor, cb_model);
if (!force_boardmismatch) if (!force_boardmismatch) {
return 1; ret = 1;
goto internal_init_exit;
}
msg_pinfo("Continuing anyway.\n"); msg_pinfo("Continuing anyway.\n");
} }
} }
@ -281,8 +290,9 @@ int internal_init(void)
if (ret == -2) { if (ret == -2) {
msg_perr("WARNING: No chipset found. Flash detection " msg_perr("WARNING: No chipset found. Flash detection "
"will most likely fail.\n"); "will most likely fail.\n");
} else if (ret == ERROR_FATAL) } else if (ret == ERROR_FATAL) {
return ret; goto internal_init_exit;
}
#if IS_X86 #if IS_X86
/* Probe unconditionally for ITE Super I/O chips. This enables LPC->SPI translation on IT87* and /* Probe unconditionally for ITE Super I/O chips. This enables LPC->SPI translation on IT87* and
@ -291,7 +301,8 @@ int internal_init(void)
if (board_flash_enable(board_vendor, board_model, cb_vendor, cb_model)) { if (board_flash_enable(board_vendor, board_model, cb_vendor, cb_model)) {
msg_perr("Aborting to be safe.\n"); msg_perr("Aborting to be safe.\n");
return 1; ret = 1;
goto internal_init_exit;
} }
#endif #endif
@ -325,7 +336,13 @@ int internal_init(void)
"========================================================================\n"); "========================================================================\n");
} }
return 0; ret = 0;
internal_init_exit:
free(board_vendor);
free(board_model);
return ret;
} }
static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, static void internal_chip_writeb(const struct flashctx *flash, uint8_t val,

2
programmer.h
View File

@ -272,7 +272,7 @@ void internal_delay(unsigned int usecs);
#if CONFIG_INTERNAL == 1 #if CONFIG_INTERNAL == 1
/* board_enable.c */ /* board_enable.c */
int selfcheck_board_enables(void); int selfcheck_board_enables(void);
int board_parse_parameter(const char *boardstring, const char **vendor, const char **model); int board_parse_parameter(const char *boardstring, char **vendor, char **model);
void w836xx_ext_enter(uint16_t port); void w836xx_ext_enter(uint16_t port);
void w836xx_ext_leave(uint16_t port); void w836xx_ext_leave(uint16_t port);
void probe_superio_winbond(void); void probe_superio_winbond(void);