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

Fix various tiny problems in verify_range()

Browse Source 
First of all, fix CID1130010: Resource leak as reported by Stefan Reinauer.
Alternatively to Stefan's approach, just move the malloc() out of the scope.

Additionally, get rid of an unnecessary exit(1) and correctly return -1 in all
error cases as documented.

Corresponding to flashrom svn r1800.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Stefan Tauner 2014-05-27 00:06:14 +00:00
parent 96658be407
commit df64a42d6d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
flashrom.c
View File

@ -672,20 +672,20 @@ int check_erased_range(struct flashctx *flash, unsigned int start,
*/ */
int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len) int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len)
{ {
uint8_t *readbuf = malloc(len);
int ret = 0;
if (!len) if (!len)
goto out_free; return -1;
if (!flash->chip->read) { if (!flash->chip->read) {
msg_cerr("ERROR: flashrom has no read function for this flash chip.\n"); msg_cerr("ERROR: flashrom has no read function for this flash chip.\n");
return 1; return -1;
} }
uint8_t *readbuf = malloc(len);
if (!readbuf) { if (!readbuf) {
msg_gerr("Could not allocate memory!\n"); msg_gerr("Could not allocate memory!\n");
exit(1); return -1;
} }
int ret = 0;
if (start + len > flash->chip->total_size * 1024) { if (start + len > flash->chip->total_size * 1024) {
msg_gerr("Error: %s called with start 0x%x + len 0x%x >" msg_gerr("Error: %s called with start 0x%x + len 0x%x >"
@ -699,7 +699,8 @@ int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int sta
if (ret) { if (ret) {
msg_gerr("Verification impossible because read failed " msg_gerr("Verification impossible because read failed "
"at 0x%x (len 0x%x)\n", start, len); "at 0x%x (len 0x%x)\n", start, len);
return ret; ret = -1;
goto out_free;
} }
ret = compare_range(cmpbuf, readbuf, start, len); ret = compare_range(cmpbuf, readbuf, start, len);