diff options
| author | Pei Li <peili.dev@gmail.com> | 2024-06-25 18:42:05 +0200 |
|---|---|---|
| committer | Dave Kleikamp <dave.kleikamp@oracle.com> | 2024-06-26 19:57:32 +0200 |
| commit | 7063b80268e2593e58bee8a8d709c2f3ff93e2f2 (patch) | |
| tree | 65e7d5757a64c1997eb1b340444d14622f9fa69d /fs/jfs/jfs_dmap.c | |
| parent | jfs: Fix array-index-out-of-bounds in diFree (diff) | |
| download | linux-7063b80268e2593e58bee8a8d709c2f3ff93e2f2.tar.xz linux-7063b80268e2593e58bee8a8d709c2f3ff93e2f2.zip | |
jfs: Fix shift-out-of-bounds in dbDiscardAG
When searching for the next smaller log2 block, BLKSTOL2() returned 0,
causing shift exponent -1 to be negative.
This patch fixes the issue by exiting the loop directly when negative
shift is found.
Reported-by: syzbot+61be3359d2ee3467e7e4@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=61be3359d2ee3467e7e4
Signed-off-by: Pei Li <peili.dev@gmail.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Diffstat (limited to 'fs/jfs/jfs_dmap.c')
| -rw-r--r-- | fs/jfs/jfs_dmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index cb3cda1390ad..5713994328cb 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -1626,6 +1626,8 @@ s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen) } else if (rc == -ENOSPC) { /* search for next smaller log2 block */ l2nb = BLKSTOL2(nblocks) - 1; + if (unlikely(l2nb < 0)) + break; nblocks = 1LL << l2nb; } else { /* Trim any already allocated blocks */ |