[PATCH 7/7] Squashfs: Check stream is not NULL in decompressor_multi.c

2013-11-19 Thread Phillip Lougher
Fix static checker complaint that stream is not checked in
squashfs_decompressor_destroy().

Reported-by: Dan Carpenter 
Signed-off-by: Phillip Lougher 
Reviewed-by: Minchan Kim 
---
 fs/squashfs/decompressor_multi.c | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/squashfs/decompressor_multi.c b/fs/squashfs/decompressor_multi.c
index ae54675..d6008a6 100644
--- a/fs/squashfs/decompressor_multi.c
+++ b/fs/squashfs/decompressor_multi.c
@@ -119,11 +119,10 @@ void squashfs_decompressor_destroy(struct 
squashfs_sb_info *msblk)
kfree(decomp_strm);
stream->avail_decomp--;
}
+   WARN_ON(stream->avail_decomp);
+   kfree(stream->comp_opts);
+   kfree(stream);
}
-
-   WARN_ON(stream->avail_decomp);
-   kfree(stream->comp_opts);
-   kfree(stream);
 }
 
 
-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 7/7] Squashfs: Check stream is not NULL in decompressor_multi.c

2013-11-19 Thread Phillip Lougher
Fix static checker complaint that stream is not checked in
squashfs_decompressor_destroy().

Reported-by: Dan Carpenter dan.carpen...@oracle.com
Signed-off-by: Phillip Lougher phil...@squashfs.org.uk
Reviewed-by: Minchan Kim minc...@kernel.org
---
 fs/squashfs/decompressor_multi.c | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/squashfs/decompressor_multi.c b/fs/squashfs/decompressor_multi.c
index ae54675..d6008a6 100644
--- a/fs/squashfs/decompressor_multi.c
+++ b/fs/squashfs/decompressor_multi.c
@@ -119,11 +119,10 @@ void squashfs_decompressor_destroy(struct 
squashfs_sb_info *msblk)
kfree(decomp_strm);
stream-avail_decomp--;
}
+   WARN_ON(stream-avail_decomp);
+   kfree(stream-comp_opts);
+   kfree(stream);
}
-
-   WARN_ON(stream-avail_decomp);
-   kfree(stream-comp_opts);
-   kfree(stream);
 }
 
 
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/