1 files changed, 14 insertions, 11 deletions

diff --git a/init/initramfs.c b/init/initramfs.c
index 4c00edc59689..4b9c20205092 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -413,7 +413,7 @@ static unsigned my_inptr;   /* index of next byte to be processed in inbuf */
 
 static char * __init unpack_to_rootfs(char *buf, unsigned len)
 {
-        int written;
+        int written, res;
         decompress_fn decompress;
         const char *compress_name;
         static __initdata char msg_buf[64];
@@ -445,17 +445,20 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len)
                 }
                 this_header = 0;
                 decompress = decompress_method(buf, len, &compress_name);
-                if (decompress)
-                        decompress(buf, len, NULL, flush_buffer, NULL,
+                if (decompress) {
+                        res = decompress(buf, len, NULL, flush_buffer, NULL,
                                    &my_inptr, error);
-                else if (compress_name) {
+                        if (res)
+                                error("decompressor failed");
+                } else if (compress_name) {
                         if (!message) {
                                 snprintf(msg_buf, sizeof msg_buf,
                                          "compression method %s not configured",
                                          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;
@@ -523,7 +526,7 @@ static void __init clean_rootfs(void)
         int fd;
         void *buf;
         struct linux_dirent64 *dirp;
-        int count;
+        int num;
 
         fd = sys_open("/", O_RDONLY, 0);
         WARN_ON(fd < 0);
@@ -537,9 +540,9 @@ static void __init clean_rootfs(void)
         }
 
         dirp = buf;
-        count = sys_getdents64(fd, dirp, BUF_SIZE);
-        while (count > 0) {
-                while (count > 0) {
+        num = sys_getdents64(fd, dirp, BUF_SIZE);
+        while (num > 0) {
+                while (num > 0) {
                         struct stat st;
                         int ret;
 
@@ -552,12 +555,12 @@ static void __init clean_rootfs(void)
                                         sys_unlink(dirp->d_name);
                         }
 
-                        count -= dirp->d_reclen;
+                        num -= dirp->d_reclen;
                         dirp = (void *)dirp + dirp->d_reclen;
                 }
                 dirp = buf;
                 memset(buf, 0, BUF_SIZE);
-                count = sys_getdents64(fd, dirp, BUF_SIZE);
+                num = sys_getdents64(fd, dirp, BUF_SIZE);
         }
 
         sys_close(fd);