[PATCH] Fix potential NULL pointer deref in gen_init_cpio

Fix potential NULL pointer deref in gen_init_cpio.c spotted by coverity
checker.  This fixes coverity bug #86

Without this patch we risk dereferencing a NULL `type' in the
"if ('\n' == *type) {" line.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
index 33dbcbf77c5..83acd6cc0b3 100644
--- a/usr/gen_init_cpio.c
+++ b/usr/gen_init_cpio.c
@@ -471,6 +471,7 @@ int main (int argc, char *argv[])
                                 "ERROR: incorrect format, could not locate file type line %d: '%s'\n",
                                 line_nr, line);
                         ec = -1;
+                        break;
                 }
 
                 if ('\n' == *type) {
@@ -506,7 +507,8 @@ int main (int argc, char *argv[])
                                 line_nr, line);
                 }
         }
-        cpio_trailer();
+        if (ec == 0)
+                cpio_trailer();
 
         exit(ec);
 }