September 2019 - flashrom-gerrit

Change in flashrom[master]: linux_spi: Use fgets() to read buffer size
by Jacob Garber (Code Review) 24 Sep '19

24 Sep '19

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34848 ) Change subject: linux_spi: Use fgets() to read buffer size ...................................................................... linux_spi: Use fgets() to read buffer size Since fread() returns the number of bytes read, this currently will only check for errors if it returns 0 (i.e. the file was empty). However, it is possible for fread() to encounter an error after reading a few bytes, which this doesn't catch. Fix this by using fgets() instead, which will return NULL if EOF or an error is encountered, and is simpler anyway. Change-Id: I4f37c70e97149b87c6344e63a57d11ddde7638c4 Signed-off-by: Jacob Garber <jgarber1(a)ualberta.ca> Found-by: Coverity CID 1403824 --- M linux_spi.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/48/34848/1 diff --git a/linux_spi.c b/linux_spi.c index de09e60..e3d7486 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -137,8 +137,7 @@ } char buf[10]; - memset(buf, 0, sizeof(buf)); - if (!fread(buf, 1, sizeof(buf) - 1, fp)) { + if (!fgets(buf, sizeof(buf), fp)) { if (feof(fp)) msg_pwarn("Cannot read %s: file is empty.\n", BUF_SIZE_FROM_SYSFS); else -- To view, visit https://review.coreboot.org/c/flashrom/+/34848 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4f37c70e97149b87c6344e63a57d11ddde7638c4 Gerrit-Change-Number: 34848 Gerrit-PatchSet: 1 Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca> Gerrit-MessageType: newchange

3 2

Change in flashrom[master]: print: Fix vendor string memory leak
by Jacob Garber (Code Review) 24 Sep '19

24 Sep '19

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34849 ) Change subject: print: Fix vendor string memory leak ...................................................................... print: Fix vendor string memory leak Freeing this string won't really matter in the incredible case that we run out of memory, but it keeps Coverity happy. Change-Id: I962d2f2227850473b70272bc48b3fc0a0fb11342 Signed-off-by: Jacob Garber <jgarber1(a)ualberta.ca> Found-by: Coverity CID 1403822 --- M print.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/49/34849/1 diff --git a/print.c b/print.c index 2901c50..91e5ae5 100644 --- a/print.c +++ b/print.c @@ -184,6 +184,7 @@ dev = malloc(strlen(chip->name) + 1); if (dev == NULL) { msg_gerr("Out of memory!\n"); + free(ven); return 1; } strcpy(dev, chip->name); -- To view, visit https://review.coreboot.org/c/flashrom/+/34849 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I962d2f2227850473b70272bc48b3fc0a0fb11342 Gerrit-Change-Number: 34849 Gerrit-PatchSet: 1 Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca> Gerrit-MessageType: newchange

3 2

Change in flashrom[master]: linux_mtd: Fix param memory leak
by Jacob Garber (Code Review) 24 Sep '19

24 Sep '19

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34847 ) Change subject: linux_mtd: Fix param memory leak ...................................................................... linux_mtd: Fix param memory leak extract_programmer_param() stores allocated memory in param, so make sure it is freed at the end of the function. Change-Id: I363e66b49c1ed4034ac058b94a938c8bb197e048 Signed-off-by: Jacob Garber <jgarber1(a)ualberta.ca> Found-by: Coverity CID 1403823 --- M linux_mtd.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/47/34847/1 diff --git a/linux_mtd.c b/linux_mtd.c index ae8bef2..d2df95e 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -404,5 +404,6 @@ ret = 0; linux_mtd_init_exit: + free(param); return ret; } -- To view, visit https://review.coreboot.org/c/flashrom/+/34847 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I363e66b49c1ed4034ac058b94a938c8bb197e048 Gerrit-Change-Number: 34847 Gerrit-PatchSet: 1 Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca> Gerrit-MessageType: newchange

3 2

Change in flashrom[master]: internal: Fix board vendor and model memory leaks
by Jacob Garber (Code Review) 24 Sep '19

24 Sep '19

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34846 ) Change subject: internal: Fix board vendor and model memory leaks ...................................................................... internal: Fix board vendor and model memory leaks 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(a)ualberta.ca> Found-by: Coverity CID 1230664, 1230665 --- M internal.c 1 file changed, 30 insertions(+), 13 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/46/34846/1 diff --git a/internal.c b/internal.c index 12c0ba3..112702e 100644 --- a/internal.c +++ b/internal.c @@ -210,8 +210,10 @@ } free(arg); - if (rget_io_perms()) - return 1; + if (rget_io_perms()) { + ret = 1; + goto cleanup; + } /* Default to Parallel/LPC/FWH flash devices. If a known host controller * is found, the host controller init routine sets the @@ -219,17 +221,22 @@ */ internal_buses_supported = BUS_NONSPI; - if (try_mtd() == 0) - return 0; + if (try_mtd() == 0) { + ret = 0; + goto cleanup; + } /* Initialize PCI access for flash enables */ - if (pci_init_common() != 0) - return 1; + if (pci_init_common() != 0) { + ret = 1; + goto cleanup; + } if (processor_flash_enable()) { msg_perr("Processor detection/init failed.\n" "Aborting.\n"); - return 1; + ret = 1; + goto cleanup; } #if IS_X86 @@ -238,8 +245,10 @@ 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", board_vendor, board_model, cb_vendor, cb_model); - if (!force_boardmismatch) - return 1; + if (!force_boardmismatch) { + ret = 1; + goto cleanup; + } msg_pinfo("Continuing anyway.\n"); } } @@ -281,8 +290,9 @@ if (ret == -2) { msg_perr("WARNING: No chipset found. Flash detection " "will most likely fail.\n"); - } else if (ret == ERROR_FATAL) - return ret; + } else if (ret == ERROR_FATAL) { + goto cleanup; + } #if IS_X86 /* Probe unconditionally for ITE Super I/O chips. This enables LPC->SPI translation on IT87* and @@ -291,7 +301,8 @@ if (board_flash_enable(board_vendor, board_model, cb_vendor, cb_model)) { msg_perr("Aborting to be safe.\n"); - return 1; + ret = 1; + goto cleanup; } #endif @@ -325,7 +336,13 @@ "========================================================================\n"); } - return 0; + ret = 0; + +cleanup: + free(board_vendor); + free(board_model); + + return ret; } static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, -- To view, visit https://review.coreboot.org/c/flashrom/+/34846 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9f43708f3b075896be67acec114bc6f390f8c6ca Gerrit-Change-Number: 34846 Gerrit-PatchSet: 1 Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca> Gerrit-MessageType: newchange

3 4

Change in flashrom[master]: use JEDEC_SE as the default sector erase opcode for ICH southbridge
by Mayur Panchal (Code Review) 24 Sep '19

24 Sep '19

Hello David Hendricks, I'd like you to do a code review. Please visit https://review.coreboot.org/c/flashrom/+/34689 to review the following change. Change subject: use JEDEC_SE as the default sector erase opcode for ICH southbridge ...................................................................... use JEDEC_SE as the default sector erase opcode for ICH southbridge Note: We should definitely look into on-the-fly opcode reprogramming as the comment in ich_spi_send_multicommand() suggests. Review URL: http://codereview.chromium.org/3239001 Change-Id: I379549e8fa966e75e3d8b7932700df62cf50df64 Signed-off-by: Mayur Panchal <panchalm(a)google.com> --- M ichspi.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/89/34689/1 diff --git a/ichspi.c b/ichspi.c index 8b8f0f6..fc61262 100644 --- a/ichspi.c +++ b/ichspi.c @@ -324,7 +324,7 @@ { {JEDEC_BYTE_PROGRAM, SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS, 0}, // Write Byte {JEDEC_READ, SPI_OPCODE_TYPE_READ_WITH_ADDRESS, 0}, // Read Data - {JEDEC_BE_D8, SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS, 0}, // Erase Sector + {JEDEC_SE, SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS, 0}, // Erase Sector {JEDEC_RDSR, SPI_OPCODE_TYPE_READ_NO_ADDRESS, 0}, // Read Device Status Reg {JEDEC_REMS, SPI_OPCODE_TYPE_READ_WITH_ADDRESS, 0}, // Read Electronic Manufacturer Signature {JEDEC_WRSR, SPI_OPCODE_TYPE_WRITE_NO_ADDRESS, 0}, // Write Status Register -- To view, visit https://review.coreboot.org/c/flashrom/+/34689 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I379549e8fa966e75e3d8b7932700df62cf50df64 Gerrit-Change-Number: 34689 Gerrit-PatchSet: 1 Gerrit-Owner: Mayur Panchal <panchalm(a)google.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-MessageType: newchange

3 11

Change in flashrom[master]: meson.build: bump version to 1.2
by Mario Limonciello (Code Review) 24 Sep '19

24 Sep '19

Mario Limonciello has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/35559 ) Change subject: meson.build: bump version to 1.2 ...................................................................... meson.build: bump version to 1.2 This is so that generated pkg-config will be updated as well and other projects (such as fwupd) can set a minimum version of the library to work with. It should have been updated to 1.1 at 93066002 as well, but oh well. Change-Id: Ie221d14c84b044a691cfaa012e0cf735590fab9c Signed-off-by: Mario Limonciello <mario.limonciello(a)dell.com> --- M meson.build 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/59/35559/1 diff --git a/meson.build b/meson.build index e1b6c16..6744ab4 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('flashromutils', 'c', - version : '1.0', + version : '1.2', license : 'GPL-2.0+', meson_version : '>=0.47.0', default_options : ['warning_level=2', 'c_std=c99'], -- To view, visit https://review.coreboot.org/c/flashrom/+/35559 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie221d14c84b044a691cfaa012e0cf735590fab9c Gerrit-Change-Number: 35559 Gerrit-PatchSet: 1 Gerrit-Owner: Mario Limonciello <superm1(a)gmail.com> Gerrit-MessageType: newchange

4 6

Change in flashrom[master]: flashchips.c: Add W25Q128.V..M printlock attribute
by Alan Green (Code Review) 24 Sep '19

24 Sep '19

Alan Green has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/35549 ) Change subject: flashchips.c: Add W25Q128.V..M printlock attribute ...................................................................... flashchips.c: Add W25Q128.V..M printlock attribute Add a printlock attribute for the Winbond W25Q128.V..M chip. The printlock attributes matches the ChromiumOS repo's definition of this chip. Signed-off-by: Alan Green <avg(a)google.com> Change-Id: I775d5d40677593dcb2d05750f8bbc62871b0e551 --- M flashchips.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/49/35549/1 diff --git a/flashchips.c b/flashchips.c index 8baa2ee..7635942 100644 --- a/flashchips.c +++ b/flashchips.c @@ -15807,6 +15807,7 @@ .block_erase = spi_block_erase_c7, } }, + .printlock = spi_prettyprint_status_register_plain, .unlock = spi_disable_blockprotect, .write = spi_chip_write_256, .read = spi_chip_read, -- To view, visit https://review.coreboot.org/c/flashrom/+/35549 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I775d5d40677593dcb2d05750f8bbc62871b0e551 Gerrit-Change-Number: 35549 Gerrit-PatchSet: 1 Gerrit-Owner: Alan Green <avg(a)google.com> Gerrit-MessageType: newchange

2 2

Change in flashrom[master]: flashchips.c: Mark W25Q40EW as TESTED_PREW
by Alan Green (Code Review) 24 Sep '19

24 Sep '19

Alan Green has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/35535 ) Change subject: flashchips.c: Mark W25Q40EW as TESTED_PREW ...................................................................... flashchips.c: Mark W25Q40EW as TESTED_PREW Mark Winbond W25Q40EW as TESTED_PREW. The Winbond W25Q40EW has been marked TESTED_PREW in the ChromiumOS repository. ChromiumOS has the same defintion for this chip as this repo, except that ChromiumOS does not have FEATURE_OTP. Signed-off-by: Alan Green <avg(a)google.com> Change-Id: I4be5b2e1069a3f735f0dc6ec92d5f4c8946fbb02 --- M flashchips.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/35/35535/1 diff --git a/flashchips.c b/flashchips.c index 0502b86..7635942 100644 --- a/flashchips.c +++ b/flashchips.c @@ -16231,7 +16231,7 @@ .page_size = 256, /* OTP: 3*256B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = -- To view, visit https://review.coreboot.org/c/flashrom/+/35535 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4be5b2e1069a3f735f0dc6ec92d5f4c8946fbb02 Gerrit-Change-Number: 35535 Gerrit-PatchSet: 1 Gerrit-Owner: Alan Green <avg(a)google.com> Gerrit-MessageType: newchange

2 2

Change in flashrom[master]: libflashrom.h: Add types not included in all projects
by Mario Limonciello (Code Review) 24 Sep '19

24 Sep '19

Mario Limonciello has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/35155 ) Change subject: libflashrom.h: Add types not included in all projects ...................................................................... libflashrom.h: Add types not included in all projects Fixes this in fwupd: ``` cc -Iplugins/flashrom/1ac62b6@@fu_plugin_flashrom@sha -Iplugins/flashrom -I../plugins/flashrom -Iplugins/flashrom/../.. -I../plugins/flashrom/../.. -Iplugins/flashrom/../../src -I../plugins/flashrom/../../src -Iplugins/flashrom/../../libfwupd -I../plugins/flashrom/../../libfwupd -Isubprojects/flashrom -I../subprojects/flashrom -Isrc -I/usr/include/libxmlb-1 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/gusb-1 -I/usr/include/libusb-1.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gudev-1.0 -I/usr/include/x86_64-linux-gnu -I/usr/include/libftdi1 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c99 -g -fstack-protector-strong -Waggregate-return -Wunused -Warray-bounds -Wcast-align -Wclobbered -Wdeclaration-after-statement -Wduplicated-branches -Wduplicated-cond -Wempty-body -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-signedness -Wignored-qualifiers -Wimplicit-function-declaration -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wmissing-parameter-type -Wmissing-prototypes -Wnested-externs -Wno-cast-function-type -Wno-address-of-packed-member -Wno-unknown-pragmas -Wno-deprecated-declarations -Wno-discarded-qualifiers -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-suggest-attribute=format -Wno-unused-parameter -Wnull-dereference -Wold-style-definition -Woverride-init -Wpointer-arith -Wredundant-decls -Wreturn-type -Wshadow -Wsign-compare -Wstrict-aliasing -Wstrict-prototypes -Wswitch-default -Wtype-limits -Wundef -Wuninitialized -Wunused-but-set-variable -Wunused-variable -Wvla -Wwrite-strings -D_DEFAULT_SOURCE -DFWUPD_DISABLE_DEPRECATED -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -fPIC -pthread '-DG_LOG_DOMAIN="FuPluginFlashrom"' '-DLOCALSTATEDIR="/usr/local/var"' -MD -MQ 'plugins/flashrom/1ac62b6@@fu_plugin_flashrom@sha/fu-plugin-flashrom.c.o' -MF 'plugins/flashrom/1ac62b6@@fu_plugin_flashrom@sha/fu-plugin-flashrom.c.o.d' -o 'plugins/flashrom/1ac62b6@@fu_plugin_flashrom@sha/fu-plugin-flashrom.c.o' -c ../plugins/flashrom/fu-plugin-flashrom.c In file included from ../plugins/flashrom/fu-plugin-flashrom.c:27: ../subprojects/flashrom/libflashrom.h:57:72: error: unknown type name ‘bool’ 57 | void flashrom_flag_set(struct flashrom_flashctx *, enum flashrom_flag, bool value); | ^~~~ ../subprojects/flashrom/libflashrom.h:58:1: error: unknown type name ‘bool’ 58 | bool flashrom_flag_get(const struct flashrom_flashctx *, enum flashrom_flag); | ^~~~ ../subprojects/flashrom/libflashrom.h:69:37: error: unknown type name ‘uint8_t’ 69 | struct flashrom_flashctx *, const uint8_t *buf, size_t len); | ^~~~~~~ ``` Signed-off-by: Mario Limonciello <mario.limonciello(a)dell.com> Change-Id: Ib48ddc6412f82677f43e445346dc64ccfadf2423 --- M libflashrom.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/55/35155/1 diff --git a/libflashrom.h b/libflashrom.h index 38c95d2..ed42d6d 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -20,6 +20,8 @@ #include <sys/types.h> #include <stddef.h> +#include <stdbool.h> +#include <cstdint.h> #include <stdarg.h> int flashrom_init(int perform_selfcheck); -- To view, visit https://review.coreboot.org/c/flashrom/+/35155 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib48ddc6412f82677f43e445346dc64ccfadf2423 Gerrit-Change-Number: 35155 Gerrit-PatchSet: 1 Gerrit-Owner: Mario Limonciello <superm1(a)gmail.com> Gerrit-MessageType: newchange

3 8

Change in flashrom[master]: flashchips.c: EN29F002(A)(N)B tested +EW
by Alan Green (Code Review) 18 Sep '19

18 Sep '19

Alan Green has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/35092 ) Change subject: flashchips.c: EN29F002(A)(N)B tested +EW ...................................................................... flashchips.c: EN29F002(A)(N)B tested +EW Mark EN29F002(A)(N)B as tested for erase and write. This chip was marked tested in the Chromium (downstream) repo change 98d917cfba55b68516cdf64c754d2f36c8c26722 "Add a bunch of new/tested stuff and various small changes 8" TEST=Build and run flashrom -L Signed-off-by: Alan Green <avg(a)google.com> Change-Id: Idd26187905f389fc858eea5b13915af88e40afe9 --- M flashchips.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/92/35092/1 diff --git a/flashchips.c b/flashchips.c index f84f1cc..3994c93 100644 --- a/flashchips.c +++ b/flashchips.c @@ -5398,7 +5398,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PR, + .tested = TEST_OK_PREW, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = -- To view, visit https://review.coreboot.org/c/flashrom/+/35092 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Idd26187905f389fc858eea5b13915af88e40afe9 Gerrit-Change-Number: 35092 Gerrit-PatchSet: 1 Gerrit-Owner: Alan Green <avg(a)google.com> Gerrit-MessageType: newchange

3 7

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit September 2019