summaryrefslogtreecommitdiff
path: root/fs/jfs
diff options
context:
space:
mode:
authorHoi Pok Wu <wuhoipok@gmail.com>2022-10-25 18:20:45 +0300
committerDave Kleikamp <dave.kleikamp@oracle.com>2022-10-28 01:34:21 +0300
commit25e70c6162f207828dd405b432d8f2a98dbf7082 (patch)
tree2e8dea56c41ce8c654eabf1ee5f6bbe99af0c228 /fs/jfs
parentebe060369f8d6e4588b115f252bebf5ba4d64350 (diff)
downloadlinux-25e70c6162f207828dd405b432d8f2a98dbf7082.tar.xz
fs: jfs: fix shift-out-of-bounds in dbDiscardAG
This should be applied to most URSAN bugs found recently by syzbot, by guarding the dbMount. As syzbot feeding rubbish into the bmap descriptor. Signed-off-by: Hoi Pok Wu <wuhoipok@gmail.com> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Diffstat (limited to 'fs/jfs')
-rw-r--r--fs/jfs/jfs_dmap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index e1cbfbb60303..765838578a72 100644
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -198,6 +198,11 @@ int dbMount(struct inode *ipbmap)
goto err_release_metapage;
}
+ if (((bmp->db_mapsize - 1) >> bmp->db_agl2size) > MAXAG) {
+ err = -EINVAL;
+ goto err_release_metapage;
+ }
+
for (i = 0; i < MAXAG; i++)
bmp->db_agfree[i] = le64_to_cpu(dbmp_le->dn_agfree[i]);
bmp->db_agsize = le64_to_cpu(dbmp_le->dn_agsize);