linux-kernel - Re: [PATCH] jfs: fix shift-out-of-bounds in dbSplit

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <27591dea-ba0b-4193-9335-680aa96441ef@oracle.com>
Date: Tue, 29 Oct 2024 16:53:04 -0500
From: Dave Kleikamp <dave.kleikamp@...cle.com>
To: Ghanshyam Agrawal <ghanshyam1898@...il.com>, ghandatmanas@...il.com,
        juntong.deng@...look.com, aha310510@...il.com, peili.dev@...il.com,
        eadavis@...com
Cc: jfs-discussion@...ts.sourceforge.net, linux-kernel@...r.kernel.org,
        syzbot+b5ca8a249162c4b9a7d0@...kaller.appspotmail.com
Subject: Re: [PATCH] jfs: fix shift-out-of-bounds in dbSplit

On 9/30/24 3:12AM, Ghanshyam Agrawal wrote:
> When dmt_budmin is less than zero, it causes errors
> in the later stages. Added a check to return an error beforehand
> in dbAllocCtl itself.
> 
> Reported-by: syzbot+b5ca8a249162c4b9a7d0@...kaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=b5ca8a249162c4b9a7d0
> Signed-off-by: Ghanshyam Agrawal <ghanshyam1898@...il.com>
> ---
>   fs/jfs/jfs_dmap.c | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
> index 974ecf5e0d95..f65a07252c22 100644
> --- a/fs/jfs/jfs_dmap.c
> +++ b/fs/jfs/jfs_dmap.c
> @@ -1808,6 +1808,7 @@ dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, s64 * results)
>   	s64 b, lblkno, n;
>   	struct metapage *mp;
>   	struct dmap *dp;
> +	dmtree_t *tp;
>   
>   	/* check if the allocation request is confined to a single dmap.
>   	 */
> @@ -1819,6 +1820,10 @@ dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, s64 * results)
>   		if (mp == NULL)
>   			return -EIO;
>   		dp = (struct dmap *) mp->data;
> +		tp = (dmtree_t *) &dp->tree;
> +
> +		if (tp->dmt_budmin < 0)
> +			return -EIO;

I'm simplifying this to:

		if (dp->tree.budmin < 0)
			return -EIO;
>   
>   		/* try to allocate the blocks.
>   		 */

Other than that. It looks good. I'll apply it.

Shaggy