commit aa1e816fc92215f94bdfd90107baae8fdc2440d1
author Jesper Juhl <jesper.juhl@gmail.com> Tue Apr 18 22:21:54 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed Apr 19 09:13:52 2006 -0700
tree 1d520ff39b65a7d3a5f68008eb44ea15c63e0d96
parent 9dfb563b07b1aafcd7d40528ebfa7f9ce28f0556

[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>

usr/gen_init_cpio.c

diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
index 33dbcbf..83acd6c 100644
--- a/usr/gen_init_cpio.c
+++ b/usr/gen_init_cpio.c
@@ -471,6 +471,7 @@
 				"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 @@
 				line_nr, line);
 		}
 	}
-	cpio_trailer();
+	if (ec == 0)
+		cpio_trailer();
 
 	exit(ec);
 }