The patch titled
fs/squashfs/xz_wrapper.c: don't use uninitialized variable in squashfs_xz_uncompress()
has been removed from the -mm tree. Its filename was
fs-squashfs-xz_wrapperc-dont-use-uninitialized-variable-in-squashfs_xz_uncompress.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: fs/squashfs/xz_wrapper.c: don't use uninitialized variable in squashfs_xz_uncompress()
From: Jesper Juhl <jj@xxxxxxxxxxxxx>
In fs/squashfs/xz_wrapper.c::squashfs_xz_uncompress() we have this code:
enum xz_ret xz_err;
...
do {
if (stream->buf.in_pos == stream->buf.in_size && k < b) {
... [nothing that assigns to 'xz_err'] ...
if (avail == 0) {
offset = 0;
put_bh(bh[k++]);
continue;
}
...
} while (xz_err == XZ_OK);
If we hit that 'continue' statement the first time through, then the
'while' condition will be testing an uninitialized 'xz_err' - not what we
want.
This patch should take care of the problem by making sure that 'xz_err' is
initialized to 'XZ_OK' at the start of the function.
Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Cc: Phillip Lougher <phillip@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/squashfs/xz_wrapper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN fs/squashfs/xz_wrapper.c~fs-squashfs-xz_wrapperc-dont-use-uninitialized-variable-in-squashfs_xz_uncompress fs/squashfs/xz_wrapper.c
--- a/fs/squashfs/xz_wrapper.c~fs-squashfs-xz_wrapperc-dont-use-uninitialized-variable-in-squashfs_xz_uncompress
+++ a/fs/squashfs/xz_wrapper.c
@@ -74,7 +74,7 @@ static int squashfs_xz_uncompress(struct
struct buffer_head **bh, int b, int offset, int length, int srclength,
int pages)
{
- enum xz_ret xz_err;
+ enum xz_ret xz_err = XZ_OK;
int avail, total = 0, k = 0, page = 0;
struct squashfs_xz *stream = msblk->stream;
_
Patches currently in -mm which might be from jj@xxxxxxxxxxxxx are
origin.patch
mm-memcontrolc-fix-uninitialized-variable-use-in-mem_cgroup_move_parent.patch
linux-next.patch
fs-squashfs-zlib_wrapperc-dont-use-uninitialized-variable-in-zlib_uncompress.patch
squashfs-fix-use-of-uninitialised-variable-in-zlib-xz-decompressors.patch
x86-numa-add-error-handling-for-bad-cpu-to-node-mappings.patch
audit-always-follow-va_copy-with-va_end.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
