From: Manas Ghandat <ghandatmanas@gmail.com>
To: dave.kleikamp@oracle.com, shaggy@kernel.org
Cc: Linux-kernel-mentees@lists.linuxfoundation.org,
jfs-discussion@lists.sourceforge.net,
Manas Ghandat <ghandatmanas@gmail.com>,
linux-kernel@vger.kernel.org,
syzbot+411debe54d318eaed386@syzkaller.appspotmail.com
Subject: [PATCH] jfs: fix shift-out-of-bounds in dbJoin
Date: Wed, 11 Oct 2023 20:09:37 +0530 [thread overview]
Message-ID: <20231011143937.31996-1-ghandatmanas@gmail.com> (raw)
Currently while joining the leaf in a buddy system there is shift out
of bound error in calculation of BUDSIZE. Added the required check
to the BUDSIZE and fixed the documentation as well.
Reported-by: syzbot+411debe54d318eaed386@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=411debe54d318eaed386
Signed-off-by: Manas Ghandat <ghandatmanas@gmail.com>
---
fs/jfs/jfs_dmap.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index 6b838d3ae7c2..baa97bda1c7a 100644
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -2730,7 +2730,9 @@ static int dbBackSplit(dmtree_t * tp, int leafno)
* leafno - the number of the leaf to be updated.
* newval - the new value for the leaf.
*
- * RETURN VALUES: none
+ * RETURN VALUES:
+ * 0 - success
+ * -EIO - i/o error
*/
static int dbJoin(dmtree_t * tp, int leafno, int newval)
{
@@ -2757,6 +2759,10 @@ static int dbJoin(dmtree_t * tp, int leafno, int newval)
* get the buddy size (number of words covered) of
* the new value.
*/
+
+ if ((newval - tp->dmt_budmin) > BUDMIN)
+ return -EIO;
+
budsz = BUDSIZE(newval, tp->dmt_budmin);
/* try to join.
--
2.37.2
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next reply other threads:[~2023-10-11 14:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 14:39 Manas Ghandat [this message]
2023-10-16 15:00 ` [PATCH] jfs: fix shift-out-of-bounds in dbJoin Manas Ghandat
2023-11-01 6:42 ` Manas Ghandat
2023-11-01 15:57 ` Dave Kleikamp
2024-01-28 20:49 ` Matthew Wilcox
2024-01-29 14:39 ` Dave Kleikamp
2024-01-29 14:55 ` Matthew Wilcox
2024-01-29 15:00 ` Dave Kleikamp
2024-01-29 18:29 ` Matthew Wilcox
2024-01-29 21:17 ` Dave Kleikamp
2024-01-29 22:13 ` Matthew Wilcox
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=20231011143937.31996-1-ghandatmanas@gmail.com \
--to=ghandatmanas@gmail.com \
--cc=Linux-kernel-mentees@lists.linuxfoundation.org \
--cc=dave.kleikamp@oracle.com \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=shaggy@kernel.org \
--cc=syzbot+411debe54d318eaed386@syzkaller.appspotmail.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