Unverified Commit df41305a authored Aug 29, 2024 by openeuler-ci-bot Committed by Gitee Aug 29, 2024

!11244 [sync] PR-11210: jfs: Fix shift-out-of-bounds in dbDiscardAG

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/11210 
 
PR sync from: GONG Ruiqi <gongruiqi1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6T2X6QNOEIEW54ZRF5OM7JENOAJFLY55/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAMMML 
 
Link:https://gitee.com/openeuler/kernel/pulls/11244

 

Reviewed-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

parents d33012fa 99a52aba

fs/jfs/jfs_dmap.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1687,6 +1687,8 @@ s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen)
		} else if (rc == -ENOSPC) {
		/* search for next smaller log2 block */
		l2nb = BLKSTOL2(nblocks) - 1;
		if (unlikely(l2nb < 0))
		break;
		nblocks = 1LL << l2nb;
		} else {
		/* Trim any already allocated blocks */