]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
x86, build: Make sure mkpiggy fails on read error
authorDaniel J Blueman <daniel.blueman@gmail.com>
Wed, 23 Feb 2011 01:33:59 +0000 (09:33 +0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 2 Mar 2011 00:32:03 +0000 (16:32 -0800)
Ensure build doesn't silently continue despite read failure,
addressing a warning due to the unchecked call.

Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
LKML-Reference: <AANLkTimxxTMU3=4ry-_zbY6v1xiDi+hW9y1RegTr8vLK@mail.gmail.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/boot/compressed/mkpiggy.c

index 646aa78ba5fdb2fe89e54d52b88a2ce5f7c6e20f..46a82388243785a4c98dbb4641765549dc47d12b 100644 (file)
@@ -62,7 +62,12 @@ int main(int argc, char *argv[])
        if (fseek(f, -4L, SEEK_END)) {
                perror(argv[1]);
        }
-       fread(&olen, sizeof olen, 1, f);
+
+       if (fread(&olen, sizeof(olen), 1, f) != 1) {
+               perror(argv[1]);
+               return 1;
+       }
+
        ilen = ftell(f);
        olen = getle32(&olen);
        fclose(f);