summaryrefslogtreecommitdiffstats
path: root/usr.bin/mkimg
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2014-05-21 17:37:22 +0000
committermarcel <marcel@FreeBSD.org>2014-05-21 17:37:22 +0000
commitf845ed23755391f815afb35685d8d38f0d0b654e (patch)
tree62fbd9d5ba3a8e9aebb4759145111435d23abee1 /usr.bin/mkimg
parent65627bf1cbe652f4e8bd9f5093dfd8e78fe4c3fb (diff)
downloadFreeBSD-src-f845ed23755391f815afb35685d8d38f0d0b654e.zip
FreeBSD-src-f845ed23755391f815afb35685d8d38f0d0b654e.tar.gz
Fix CID 1215125: fstat(2) returns -1 on error and sets errno. It does
not return the error (oops).
Diffstat (limited to 'usr.bin/mkimg')
-rw-r--r--usr.bin/mkimg/scheme.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c
index 79312ef..7546ae2 100644
--- a/usr.bin/mkimg/scheme.c
+++ b/usr.bin/mkimg/scheme.c
@@ -103,14 +103,12 @@ int
scheme_bootcode(int fd)
{
struct stat sb;
- int error;
if (scheme->bootcode == 0)
return (ENXIO);
- error = fstat(fd, &sb);
- if (error)
- return (error);
+ if (fstat(fd, &sb) == -1)
+ return (errno);
if (sb.st_size > scheme->bootcode)
return (EFBIG);
OpenPOWER on IntegriCloud