diff options
| author | Hoi Pok Wu | 2022-10-25 23:20:45 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2022-12-31 13:32:57 +0100 |
| commit | 3d340b684dcec5e34efc470227cd1c7d2df121ad (patch) | |
| tree | 83f6f24b1e346e14717355b95d926a87db967344 /fs | |
| parent | ccb6bdf0b7b64beb8c0808cef0bcf9e893504830 (diff) | |
fs: jfs: fix shift-out-of-bounds in dbDiscardAG
[ Upstream commit 25e70c6162f207828dd405b432d8f2a98dbf7082 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jfs/jfs_dmap.c | 5 |
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); |