From: Edward Adam Davis <eadavis@qq.com>
To: syzbot+6c746eea496f34b3161d@syzkaller.appspotmail.com
Cc: chao@kernel.org, huyue2@coolpad.com, jefflexu@linux.alibaba.com,
linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com,
xiang@kernel.org
Subject: [PATCH] erofs: fix uninit-value in z_erofs_lz4_decompress
Date: Fri, 29 Dec 2023 19:09:39 +0800 [thread overview]
Message-ID: <tencent_8D66B23C9D36BA971637084BA27411767F09@qq.com> (raw)
In-Reply-To: <000000000000321c24060d7cfa1c@google.com>
When LZ4 decompression fails, the number of bytes read from out should be
inputsize plus the returned overflow value ret.
Reported-and-tested-by: syzbot+6c746eea496f34b3161d@syzkaller.appspotmail.com
Signed-off-by: Edward Adam Davis <eadavis@qq.com>
---
fs/erofs/decompressor.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c
index 021be5feb1bc..8ac3f96676c4 100644
--- a/fs/erofs/decompressor.c
+++ b/fs/erofs/decompressor.c
@@ -250,7 +250,8 @@ static int z_erofs_lz4_decompress_mem(struct z_erofs_lz4_decompress_ctx *ctx,
print_hex_dump(KERN_DEBUG, "[ in]: ", DUMP_PREFIX_OFFSET,
16, 1, src + inputmargin, rq->inputsize, true);
print_hex_dump(KERN_DEBUG, "[out]: ", DUMP_PREFIX_OFFSET,
- 16, 1, out, rq->outputsize, true);
+ 16, 1, out, (ret < 0 && rq->inputsize > 0) ?
+ (ret + rq->inputsize) : rq->outputsize, true);
if (ret >= 0)
memset(out + ret, 0, rq->outputsize - ret);
--
2.43.0
next prev parent reply other threads:[~2023-12-29 11:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-27 12:31 [syzbot] [erofs?] KMSAN: uninit-value in z_erofs_lz4_decompress (2) syzbot
2023-12-28 3:36 ` Gao Xiang
2023-12-28 4:23 ` syzbot
2023-12-29 11:09 ` Edward Adam Davis [this message]
2023-12-31 1:14 ` [PATCH] erofs: fix uninit-value in z_erofs_lz4_decompress Gao Xiang
2023-12-31 2:32 ` Edward Adam Davis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_8D66B23C9D36BA971637084BA27411767F09@qq.com \
--to=eadavis@qq.com \
--cc=chao@kernel.org \
--cc=huyue2@coolpad.com \
--cc=jefflexu@linux.alibaba.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=syzbot+6c746eea496f34b3161d@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
--cc=xiang@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).