Unverified Commit 41255614 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12511 jfs: Fix array-index-out-of-bounds in diFree 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Zekun <zhangzekun11@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VO2RVFJ6G3NIQLZ35FSH74FQXZK6A7PP/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKQ4Y 
 
Link:https://gitee.com/openeuler/kernel/pulls/12511

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 82948c64 92b08284

fs/jfs/jfs_imap.c

+4 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ int diSync(struct inode *ipimap) 
int diRead(struct inode *ip)

{

	struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);

	int iagno, ino, extno, rc;

	int iagno, ino, extno, rc, agno;

	struct inode *ipimap;

	struct dinode *dp;

	struct iag *iagp;
@@ -341,8 +341,11 @@ int diRead(struct inode *ip) 


	/* get the ag for the iag */

	agstart = le64_to_cpu(iagp->agstart);

	agno = BLKTOAG(agstart, JFS_SBI(ip->i_sb));



	release_metapage(mp);

	if (agno >= MAXAG || agno < 0)

		return -EIO;



	rel_inode = (ino & (INOSPERPAGE - 1));

	pageno = blkno >> sbi->l2nbperpage;