flashrom April 2014

flashrom@flashrom.org

32 participants
121 discussions

[commit] r1779 - trunk
by repository service 26 Apr '14

26 Apr '14

Author: stefanct Date: Sat Apr 26 18:12:55 2014 New Revision: 1779 URL: http://flashrom.org/trac/flashrom/changeset/1779 Log: CID1130000: Unchecked return value in default_spi_write_aai(). Also, try to always disable WRDI because else the user is stuck with a chip in AAI mode that won't return by itself w/o a reset. Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/spi25.c Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Sat Apr 26 18:12:45 2014 (r1778) +++ trunk/spi25.c Sat Apr 26 18:12:55 2014 (r1779) @@ -1128,13 +1128,9 @@ result = spi_send_multicommand(flash, cmds); - if (result) { - msg_cerr("%s failed during start command execution\n", - __func__); - /* FIXME: Should we send WRDI here as well to make sure the chip - * is not in AAI mode? - */ - return result; + if (result != 0) { + msg_cerr("%s failed during start command execution: %d\n", __func__, result); + goto bailout; } while (spi_read_status_register(flash) & SPI_SR_WIP) programmer_delay(10); @@ -1146,8 +1142,11 @@ while (pos < start + len - 1) { cmd[1] = buf[pos++ - start]; cmd[2] = buf[pos++ - start]; - spi_send_command(flash, JEDEC_AAI_WORD_PROGRAM_CONT_OUTSIZE, 0, - cmd, NULL); + result = spi_send_command(flash, JEDEC_AAI_WORD_PROGRAM_CONT_OUTSIZE, 0, cmd, NULL); + if (result != 0) { + msg_cerr("%s failed during followup AAI command execution: %d\n", __func__, result); + goto bailout; + } while (spi_read_status_register(flash) & SPI_SR_WIP) programmer_delay(10); } @@ -1165,4 +1164,8 @@ } return 0; + +bailout: + spi_write_disable(flash); + return SPI_GENERIC_ERROR; }

1 0

[commit] r1778 - trunk
by repository service 26 Apr '14

26 Apr '14

Author: stefanct Date: Sat Apr 26 18:12:45 2014 New Revision: 1778 URL: http://flashrom.org/trac/flashrom/changeset/1778 Log: CID1130006: Memory leaks in buspirate_spi_init(). The one in the error case of register_shutdown() was discovered while reviewing the other one found by Coverity and fixed by Stefan Reinauer. Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/buspirate_spi.c Modified: trunk/buspirate_spi.c ============================================================================== --- trunk/buspirate_spi.c Sat Apr 26 18:12:31 2014 (r1777) +++ trunk/buspirate_spi.c Sat Apr 26 18:12:45 2014 (r1778) @@ -250,6 +250,7 @@ if (!bp_commbuf) { bp_commbufsize = 0; msg_perr("Out of memory!\n"); + free(dev); return ERROR_OOM; } bp_commbufsize = DEFAULT_BUFSIZE; @@ -263,8 +264,12 @@ return ret; } - if (register_shutdown(buspirate_spi_shutdown, NULL)) + if (register_shutdown(buspirate_spi_shutdown, NULL) != 0) { + bp_commbufsize = 0; + free(bp_commbuf); + bp_commbuf = NULL; return 1; + } /* This is the brute force version, but it should work. * It is likely to fail if a previous flashrom run was aborted during a write with the new SPI commands

1 0

[commit] r1777 - trunk
by repository service 26 Apr '14

26 Apr '14

Author: stefanct Date: Sat Apr 26 18:12:31 2014 New Revision: 1777 URL: http://flashrom.org/trac/flashrom/changeset/1777 Log: CID1129996: Unchecked return value from setsockopt() in serprog. Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/serprog.c Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Sat Apr 26 18:12:15 2014 (r1776) +++ trunk/serprog.c Sat Apr 26 18:12:31 2014 (r1777) @@ -115,7 +115,11 @@ } /* We are latency limited, and sometimes do write-write-read * * (write-n) - so enable TCP_NODELAY. */ - setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int)); + if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int))) { + close(sock); + msg_perr("Error: serprog cannot set socket options: %s\n", strerror(errno)); + return -1; + } return sock; } #endif

1 0

[commit] r1776 - trunk
by repository service 26 Apr '14

26 Apr '14

Author: stefanct Date: Sat Apr 26 18:12:15 2014 New Revision: 1776 URL: http://flashrom.org/trac/flashrom/changeset/1776 Log: CID1130002: Logically dead code due to copy and paste error. What we really want to do is check whether PCI_BASE_ADDRESS_2 is valid at this point, and not PCI_BASE_ADDRESS_0. Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/satamv.c Modified: trunk/satamv.c ============================================================================== --- trunk/satamv.c Sat Apr 26 18:12:03 2014 (r1775) +++ trunk/satamv.c Sat Apr 26 18:12:15 2014 (r1776) @@ -138,7 +138,7 @@ pci_rmmio_writel(tmp, mv_bar + GPIO_PORT_CONTROL); /* Get I/O BAR location. */ - tmp = pcidev_readbar(dev, PCI_BASE_ADDRESS_2); + addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_2); if (!addr) return 1; @@ -146,7 +146,7 @@ * FIXME: Check if the I/O BAR is actually reachable. * This is an arch specific check. */ - mv_iobar = tmp & 0xffff; + mv_iobar = addr & 0xffff; msg_pspew("Activating I/O BAR at 0x%04x\n", mv_iobar); /* 512 kByte with two 8-bit latches, and

1 0

[commit] r1775 - trunk
by repository service 26 Apr '14

26 Apr '14

Author: stefanct Date: Sat Apr 26 18:12:03 2014 New Revision: 1775 URL: http://flashrom.org/trac/flashrom/changeset/1775 Log: CID1130009: Resource leak in sp_opensocket(). Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/serprog.c Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Sat Apr 26 18:11:50 2014 (r1774) +++ trunk/serprog.c Sat Apr 26 18:12:03 2014 (r1775) @@ -100,6 +100,7 @@ if (NULL == hostPtr) { hostPtr = gethostbyaddr(ip, strlen(ip), AF_INET); if (NULL == hostPtr) { + close(sock); msg_perr("Error: cannot resolve %s\n", ip); return -1; }

1 0

[commit] r1774 - trunk
by repository service 26 Apr '14

26 Apr '14

Author: stefanct Date: Sat Apr 26 18:11:50 2014 New Revision: 1774 URL: http://flashrom.org/trac/flashrom/changeset/1774 Log: CID1130007: Resource leak in ogp_spi. Memory leak in ogp_spi_init(). Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/ogp_spi.c Modified: trunk/ogp_spi.c ============================================================================== --- trunk/ogp_spi.c Sat Apr 26 18:11:39 2014 (r1773) +++ trunk/ogp_spi.c Sat Apr 26 18:11:50 2014 (r1774) @@ -120,8 +120,10 @@ ogp_reg_sck = OGA1_XP10_CPROM_SCK; } else { msg_perr("Invalid or missing rom= parameter.\n"); + free(type); return 1; } + free(type); if (rget_io_perms()) return 1;

1 0

[commit] r1773 - trunk
by repository service 26 Apr '14

26 Apr '14

Author: stefanct Date: Sat Apr 26 18:11:39 2014 New Revision: 1773 URL: http://flashrom.org/trac/flashrom/changeset/1773 Log: CID1130008: Resource leak read_romlayout(). Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/layout.c Modified: trunk/layout.c ============================================================================== --- trunk/layout.c Sat Apr 26 18:11:30 2014 (r1772) +++ trunk/layout.c Sat Apr 26 18:11:39 2014 (r1773) @@ -65,6 +65,7 @@ if (num_rom_entries >= MAX_ROMLAYOUT) { msg_gerr("Maximum number of ROM images (%i) in layout " "file reached.\n", MAX_ROMLAYOUT); + fclose(romlayout); return 1; } if (2 != fscanf(romlayout, "%s %s\n", tempstr, rom_entries[num_rom_entries].name))

1 0

[commit] r1772 - trunk
by repository service 26 Apr '14

26 Apr '14

Author: stefanct Date: Sat Apr 26 18:11:30 2014 New Revision: 1772 URL: http://flashrom.org/trac/flashrom/changeset/1772 Log: CID1130012: Double free in pony_spi_init(). Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/pony_spi.c Modified: trunk/pony_spi.c ============================================================================== --- trunk/pony_spi.c Sat Apr 26 18:11:21 2014 (r1771) +++ trunk/pony_spi.c Sat Apr 26 18:11:30 2014 (r1772) @@ -140,6 +140,7 @@ } else if (arg && !strlen(arg)) { msg_perr("Error: Missing argument for programmer type.\n"); free(arg); + return 1; } else if (arg){ msg_perr("Error: Invalid programmer type specified.\n"); free(arg);

1 0

[commit] r1771 - trunk/util/ich_descriptors_tool
by repository service 26 Apr '14

26 Apr '14

Author: stefanct Date: Sat Apr 26 18:11:21 2014 New Revision: 1771 URL: http://flashrom.org/trac/flashrom/changeset/1771 Log: CID1130011: Use after free in ich_descriptor_tool. Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/util/ich_descriptors_tool/ich_descriptors_tool.c Modified: trunk/util/ich_descriptors_tool/ich_descriptors_tool.c ============================================================================== --- trunk/util/ich_descriptors_tool/ich_descriptors_tool.c Sat Apr 26 18:11:07 2014 (r1770) +++ trunk/util/ich_descriptors_tool/ich_descriptors_tool.c Sat Apr 26 18:11:21 2014 (r1771) @@ -77,12 +77,13 @@ printf("Dumping %u bytes of the %s region from 0x%08x-0x%08x to %s... ", file_len, region_names[i], base, limit, fn); int fh = open(fn, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); - free(fn); if (fh < 0) { fprintf(stderr, "ERROR: couldn't open(%s): %s\n", fn, strerror(errno)); + free(fn); exit(1); } + free(fn); ret = write(fh, &dump[base >> 2], file_len); if (ret != file_len) {

1 0

[commit] r1770 - trunk
by repository service 26 Apr '14

26 Apr '14

Author: stefanct Date: Sat Apr 26 18:11:07 2014 New Revision: 1770 URL: http://flashrom.org/trac/flashrom/changeset/1770 Log: CID1130004: Nesting level does not match indentation. Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/print.c Modified: trunk/print.c ============================================================================== --- trunk/print.c Wed Mar 19 18:17:06 2014 (r1769) +++ trunk/print.c Sat Apr 26 18:11:07 2014 (r1770) @@ -436,12 +436,13 @@ msg_ginfo("%s", b->name); for (i = 0; i < maxboardlen - strlen(b->name); i++) msg_ginfo(" "); - if (b->working == OK) - msg_ginfo("OK "); - else if (b->working == NT) - msg_ginfo("NT "); - else - msg_ginfo("BAD "); + + if (b->working == OK) + msg_ginfo("OK "); + else if (b->working == NT) + msg_ginfo("NT "); + else + msg_ginfo("BAD "); for (e = board_matches; e->vendor_name != NULL; e++) { if (strcmp(e->vendor_name, b->vendor)

1 0

← Newer
1
...
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom April 2014