diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-13 01:20:04 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-13 01:20:04 +0200 |
| commit | 1540c84b5ed657ed71dce06915bba461e6b09574 (patch) | |
| tree | a449dc166800a1b0c429bb038bfc974e577eaf72 /init | |
| parent | 1a3a403aa98b0ccabeb12abd7da90d33250ea36b (diff) | |
| parent | 4640b4e7d9919e9629fe8456df94f71658431ef9 (diff) | |
| download | lwn-1540c84b5ed657ed71dce06915bba461e6b09574.tar.gz lwn-1540c84b5ed657ed71dce06915bba461e6b09574.zip | |
Merge branch '2.6.33.4' into rt/2.6.33
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init')
| -rw-r--r-- | init/initramfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index b37d34beb90b..b27d045a3bd0 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -457,7 +457,8 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len) compress_name); message = msg_buf; } - } + } else + error("junk in compressed archive"); if (state != Reset) error("junk in compressed archive"); this_header = saved_offset + my_inptr; |