linux-kernel - Re: [PATCH] jfs: fix array-index-out-of-bounds in jfs

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: <d2d3514a-3f7a-4367-b7a4-953a76687053@oracle.com>
Date: Tue, 29 Oct 2024 17:07:34 -0500
From: Dave Kleikamp <dave.kleikamp@...cle.com>
To: Ghanshyam Agrawal <ghanshyam1898@...il.com>, eadavis@...com,
        osmtendev@...il.com, ghandatmanas@...il.com
Cc: jfs-discussion@...ts.sourceforge.net, linux-kernel@...r.kernel.org,
        syzbot+0315f8fe99120601ba88@...kaller.appspotmail.com
Subject: Re: [PATCH] jfs: fix array-index-out-of-bounds in jfs_readdir

On 10/1/24 1:05AM, Ghanshyam Agrawal wrote:
> The stbl might contain some invalid values. Added a check to
> return error code in that case.
> 
> Reported-by: syzbot+0315f8fe99120601ba88@...kaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=0315f8fe99120601ba88
> Signed-off-by: Ghanshyam Agrawal <ghanshyam1898@...il.com>
> ---
>   fs/jfs/jfs_dtree.c | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
> index 5d3127ca68a4..c8f6e51ac047 100644
> --- a/fs/jfs/jfs_dtree.c
> +++ b/fs/jfs/jfs_dtree.c
> @@ -2891,6 +2891,14 @@ int jfs_readdir(struct file *file, struct dir_context *ctx)
>   		stbl = DT_GETSTBL(p);
>   
>   		for (i = index; i < p->header.nextindex; i++) {
> +			if (stbl[i] < 0 || stbl[i] > 127) {
> +				DT_PUTPAGE(mp);
> +				free_page(dirent_buf);
> +				jfs_err("JFS: Invalid stbl[%d] = %d for inode %ld, block = %lld",
> +				i, stbl[i], (long)ip->i_ino, (long long)bn);

I'm moving the printing of the error message before the call to 
DT_PUTPAGE() since stbl is part of the page's data. And I'm fixing the 
indent.

> +				return -EIO;
> +			}
> +
>   			d = (struct ldtentry *) & p->slot[stbl[i]];
>   
>   			if (((long) jfs_dirent + d->namlen + 1) >

Otherwise, looks good. I'll be applying this one.

Shaggy