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

!8179 jfs: fix array-index-out-of-bounds in diAlloc 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/EWDHEWGVYSQL6CAVXOOS6I4WVWSPJOEA/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RFMU 
 
Link:https://gitee.com/openeuler/kernel/pulls/8179

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents b72cfb22 abba9222

fs/jfs/jfs_imap.c

+4 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ diInitInode(struct inode *ip, int iagno, int ino, int extno, struct iag * iagp) 
int diAlloc(struct inode *pip, bool dir, struct inode *ip)

{

	int rc, ino, iagno, addext, extno, bitno, sword;

	int nwords, rem, i, agno;

	int nwords, rem, i, agno, dn_numag;

	u32 mask, inosmap, extsmap;

	struct inode *ipimap;

	struct metapage *mp;
@@ -1357,6 +1357,9 @@ int diAlloc(struct inode *pip, bool dir, struct inode *ip) 


	/* get the ag number of this iag */

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

	dn_numag = JFS_SBI(pip->i_sb)->bmap->db_numag;

	if (agno < 0 || agno > dn_numag)

		return -EIO;



	if (atomic_read(&JFS_SBI(pip->i_sb)->bmap->db_active[agno])) {

		/*