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

!11210 jfs: Fix shift-out-of-bounds in dbDiscardAG 

Merge Pull Request from: @ci-robot 
 
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/11210

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 591c3cfd 7816bc95

fs/jfs/jfs_dmap.c

+2 −0
Original line number Diff line number Diff line
@@ -1694,6 +1694,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 */