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

Fix segfault when running flashrom -L

Browse Source 
The raiden_debug programmer is of type USB. However, it does not set the
field `devs.dev`, which will result in a segfault when trying to print
the devices of the non-existing table.

Fix that by replacing `devs.note` with `devs.dev` and adding an empty
device table. Since Device IDs are not used to match programmers,
nothing could be added to the table.

TEST=Running `flashrom -L` no longer segfaults and returns normally.

Change-Id: Ie4171a11384c34abb102d1aadf86aa1b8829fc04
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/39826
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Angel Pons 2020-03-25 13:35:45 +01:00 committed by Edward O'Callaghan
parent 548c880760
commit 6c8bd91e29
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flashrom.c
View File

@ -137,7 +137,7 @@ const struct programmer_entry programmer_table[] = {
{ {
.name = "raiden_debug", .name = "raiden_debug",
.type = USB, .type = USB,
.devs.note = "All programmer devices speaking the raiden protocol\n", .devs.dev = devs_raiden,
.init = raiden_debug_spi_init, .init = raiden_debug_spi_init,
.map_flash_region = fallback_map, .map_flash_region = fallback_map,
.unmap_flash_region = fallback_unmap, .unmap_flash_region = fallback_unmap,

1
programmer.h
View File

@ -407,6 +407,7 @@ extern const struct dev_entry gfx_nvidia[];
/* raiden_debug_spi.c */ /* raiden_debug_spi.c */
#if CONFIG_RAIDEN == 1 #if CONFIG_RAIDEN == 1
int raiden_debug_spi_init(void); int raiden_debug_spi_init(void);
extern const struct dev_entry devs_raiden[];
#endif #endif
/* drkaiser.c */ /* drkaiser.c */

5
raiden_debug_spi.c
View File

@ -116,6 +116,11 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
/* FIXME: Add some programmer IDs here */
const struct dev_entry devs_raiden[] = {
{0},
};
#define GOOGLE_VID (0x18D1) #define GOOGLE_VID (0x18D1)
#define GOOGLE_RAIDEN_SPI_SUBCLASS (0x51) #define GOOGLE_RAIDEN_SPI_SUBCLASS (0x51)
#define GOOGLE_RAIDEN_SPI_PROTOCOL (0x01) #define GOOGLE_RAIDEN_SPI_PROTOCOL (0x01)