From: Dave Kleikamp <dave.kleikamp@oracle.com>
To: Manas Ghandat <ghandatmanas@gmail.com>
Cc: Linux-kernel-mentees@lists.linuxfoundation.org,
jfs-discussion@lists.sourceforge.net,
linux-kernel@vger.kernel.org,
syzbot+aea1ad91e854d0a83e04@syzkaller.appspotmail.com
Subject: Re: [PATCH v3] jfs: fix array-index-out-of-bounds in dbFindLeaf
Date: Wed, 4 Oct 2023 09:22:42 -0500 [thread overview]
Message-ID: <86037633-6741-44bc-87a9-171d7021171d@oracle.com> (raw)
In-Reply-To: <20231004054718.7976-1-ghandatmanas@gmail.com>
On 10/4/23 12:47AM, Manas Ghandat wrote:
> Currently while searching for dmtree_t for sufficient free blocks there
> is an array out of bounds while getting element in tp->dm_stree. To add
> the required check for out of bound we first need to determine the type
> of dmtree. Thus added an extra parameter to dbFindLeaf so that the type
> of tree can be determined and the required check can be applied.
Applied to jfs-next
Thanks,
Shaggy
>
> Reported-by: syzbot+aea1ad91e854d0a83e04@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=aea1ad91e854d0a83e04
> Signed-off-by: Manas Ghandat <ghandatmanas@gmail.com>
> ---
> V2 -> V3: Changed the argument name from type to is_ctl
> V1 -> V2: Updated dbFindLeaf function.
>
> fs/jfs/jfs_dmap.c | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
> index a14a0f18a4c4..d2a4fced8976 100644
> --- a/fs/jfs/jfs_dmap.c
> +++ b/fs/jfs/jfs_dmap.c
> @@ -87,7 +87,7 @@ static int dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno,
> static int dbExtend(struct inode *ip, s64 blkno, s64 nblocks, s64 addnblocks);
> static int dbFindBits(u32 word, int l2nb);
> static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno);
> -static int dbFindLeaf(dmtree_t * tp, int l2nb, int *leafidx);
> +static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl);
> static int dbFreeBits(struct bmap * bmp, struct dmap * dp, s64 blkno,
> int nblocks);
> static int dbFreeDmap(struct bmap * bmp, struct dmap * dp, s64 blkno,
> @@ -1709,7 +1709,7 @@ static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno)
> * dbFindLeaf() returns the index of the leaf at which
> * free space was found.
> */
> - rc = dbFindLeaf((dmtree_t *) dcp, l2nb, &leafidx);
> + rc = dbFindLeaf((dmtree_t *) dcp, l2nb, &leafidx, true);
>
> /* release the buffer.
> */
> @@ -1956,7 +1956,7 @@ dbAllocDmapLev(struct bmap * bmp,
> * free space. if sufficient free space is found, dbFindLeaf()
> * returns the index of the leaf at which free space was found.
> */
> - if (dbFindLeaf((dmtree_t *) & dp->tree, l2nb, &leafidx))
> + if (dbFindLeaf((dmtree_t *) &dp->tree, l2nb, &leafidx, false))
> return -ENOSPC;
>
> if (leafidx < 0)
> @@ -2920,14 +2920,18 @@ static void dbAdjTree(dmtree_t * tp, int leafno, int newval)
> * leafidx - return pointer to be set to the index of the leaf
> * describing at least l2nb free blocks if sufficient
> * free blocks are found.
> + * is_ctl - determines if the tree is of type ctl
> *
> * RETURN VALUES:
> * 0 - success
> * -ENOSPC - insufficient free blocks.
> */
> -static int dbFindLeaf(dmtree_t * tp, int l2nb, int *leafidx)
> +static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl)
> {
> int ti, n = 0, k, x = 0;
> + int max_size;
> +
> + max_size = is_ctl ? CTLTREESIZE : TREESIZE;
>
> /* first check the root of the tree to see if there is
> * sufficient free space.
> @@ -2948,6 +2952,8 @@ static int dbFindLeaf(dmtree_t * tp, int l2nb, int *leafidx)
> /* sufficient free space found. move to the next
> * level (or quit if this is the last level).
> */
> + if (x + n > max_size)
> + return -ENOSPC;
> if (l2nb <= tp->dmt_stree[x + n])
> break;
> }
prev parent reply other threads:[~2023-10-04 14:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 5:47 Manas Ghandat
2023-10-04 14:22 ` Dave Kleikamp [this message]
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=86037633-6741-44bc-87a9-171d7021171d@oracle.com \
--to=dave.kleikamp@oracle.com \
--cc=Linux-kernel-mentees@lists.linuxfoundation.org \
--cc=ghandatmanas@gmail.com \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=syzbot+aea1ad91e854d0a83e04@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
all inboxes | Powered by JetHome®