diff options
| author | Jacob Garber <jgarber1@ualberta.ca> | 2019-08-12 14:14:40 -0600 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2019-09-24 19:09:29 +0000 |
| commit | 1c0c8fd9da34d29d549803f3ddff9a68dd95dfed (patch) | |
| tree | 4cdf8d00d844fc0286f05cda7677d298d9ead6b9 | |
| parent | 4a7970bc98c5bacd2cebcc2b4a3a39be304a1cae (diff) | |
| download | flashrom-1c0c8fd9da34d29d549803f3ddff9a68dd95dfed.tar.gz flashrom-1c0c8fd9da34d29d549803f3ddff9a68dd95dfed.tar.bz2 flashrom-1c0c8fd9da34d29d549803f3ddff9a68dd95dfed.zip | |
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@ualberta.ca>
Found-by: Coverity CID 1403824
Reviewed-on: https://review.coreboot.org/c/flashrom/+/34848
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
| -rw-r--r-- | linux_spi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux_spi.c b/linux_spi.c index de09e607b..e3d7486ee 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -137,8 +137,7 @@ int linux_spi_init(void) } 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 |