bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jfs: fix out-of-bounds in dbNextAG() and diAlloc()

Browse source 
[ Upstream commit e63866a475562810500ea7f784099bfe341e761a ]

In dbNextAG() , there is no check for the case where bmp->db_numag is
greater or same than MAXAG due to a polluted image, which causes an
out-of-bounds. Therefore, a bounds check should be added in dbMount().

And in dbNextAG(), a check for the case where agpref is greater than
bmp->db_numag should be added, so an out-of-bounds exception should be
prevented.

Additionally, a check for the case where agno is greater or same than
MAXAG should be added in diAlloc() to prevent out-of-bounds.

Reported-by: Jeongjun Park <aha310510@gmail.com>
Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Signed-off-by: Jeongjun Park <aha310510@gmail.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jeongjun Park 2024-08-19 13:05:46 +09:00 • committed by Greg Kroah-Hartman
parent baeb8628ab
commit c1ba4b8ca7
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fs/jfs/jfs_dmap.c
View file

@ -187,7 +187,7 @@ int dbMount(struct inode *ipbmap)
} }
bmp->db_numag = le32_to_cpu(dbmp_le->dn_numag); bmp->db_numag = le32_to_cpu(dbmp_le->dn_numag);
if (!bmp->db_numag) { if (!bmp->db_numag || bmp->db_numag >= MAXAG) {
err = -EINVAL; err = -EINVAL;
goto err_release_metapage; goto err_release_metapage;
} }
@ -652,7 +652,7 @@ int dbNextAG(struct inode *ipbmap)
* average free space. * average free space.
*/ */
for (i = 0 ; i < bmp->db_numag; i++, agpref++) { for (i = 0 ; i < bmp->db_numag; i++, agpref++) {
if (agpref == bmp->db_numag) if (agpref >= bmp->db_numag)
agpref = 0; agpref = 0;
if (atomic_read(&bmp->db_active[agpref])) if (atomic_read(&bmp->db_active[agpref]))

2
fs/jfs/jfs_imap.c
View file

@ -1360,7 +1360,7 @@ int diAlloc(struct inode *pip, bool dir, struct inode *ip)
/* get the ag number of this iag */ /* get the ag number of this iag */
agno = BLKTOAG(JFS_IP(pip)->agstart, JFS_SBI(pip->i_sb)); agno = BLKTOAG(JFS_IP(pip)->agstart, JFS_SBI(pip->i_sb));
dn_numag = JFS_SBI(pip->i_sb)->bmap->db_numag; dn_numag = JFS_SBI(pip->i_sb)->bmap->db_numag;
if (agno < 0 || agno > dn_numag) if (agno < 0 || agno > dn_numag || agno >= MAXAG)
return -EIO; return -EIO;
if (atomic_read(&JFS_SBI(pip->i_sb)->bmap->db_active[agno])) { if (atomic_read(&JFS_SBI(pip->i_sb)->bmap->db_active[agno])) {