The patch titled
fs/squashfs/xz_wrapper.c: don't use uninitialized variable in squashfs_xz_uncompress()
has been added to the -mm tree. Its filename is
fs-squashfs-xz_wrapperc-dont-use-uninitialized-variable-in-squashfs_xz_uncompress.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
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
linux-next.patch
mm-memcontrolc-fix-uninitialized-variable-use-in-mem_cgroup_move_parent.patch
fs-squashfs-xz_wrapperc-dont-use-uninitialized-variable-in-squashfs_xz_uncompress.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
