From: Hoi Pok Wu <wuhoipok@gmail.com>
To: shaggy@kernel.org
Cc: Hoi Pok Wu <wuhoipok@gmail.com>,
jfs-discussion@lists.sourceforge.net,
linux-kernel@vger.kernel.org,
syzbot+f0e0fcf3cd1047ae60ad@syzkaller.appspotmail.com,
syzkaller-bugs@googlegroups.com
Subject: [PATCH] fs: jfs: fix shift-out-of-bounds in dbDiscardAG
Date: Wed, 19 Oct 2022 17:38:25 +0800 [thread overview]
Message-ID: <20221019093825.339991-1-wuhoipok@gmail.com> (raw)
Bug reported by syzbot, UBSAN: array-index-out-of-bounds in dbDiscardAG.
Fixed by simply rearranging agno_end smaller than MAXAG. However, I wonder if it
is a better idea to return -EINVAL, rejecting user input. Thank you.
Reported-by: syzbot+f0e0fcf3cd1047ae60ad@syzkaller.appspotmail.com
Signed-off-by: Hoi Pok Wu <wuhoipok@gmail.com>
---
fs/jfs/jfs_discard.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/jfs/jfs_discard.c b/fs/jfs/jfs_discard.c
index 575cb2ba74fc..3101eaf3098a 100644
--- a/fs/jfs/jfs_discard.c
+++ b/fs/jfs/jfs_discard.c
@@ -96,6 +96,10 @@ int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)
*/
agno = BLKTOAG(start, JFS_SBI(ip->i_sb));
agno_end = BLKTOAG(end, JFS_SBI(ip->i_sb));
+
+ if (agno_end >= MAXAG)
+ agno_end = MAXAG - 1;
+
while (agno <= agno_end) {
trimmed += dbDiscardAG(ip, agno, minlen);
agno++;
--
2.38.0
next reply other threads:[~2022-10-19 13:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 9:38 Hoi Pok Wu [this message]
2022-10-24 21:05 ` Dave Kleikamp
2022-10-25 5:12 ` Hoi Pok Wu
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=20221019093825.339991-1-wuhoipok@gmail.com \
--to=wuhoipok@gmail.com \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=shaggy@kernel.org \
--cc=syzbot+f0e0fcf3cd1047ae60ad@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
/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
all inboxes | Powered by JetHome®