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

!14036 xfs: Fix data overflow in xfs_mod_fdblocks() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3APFTNUDGXUNMSRBZX4MXXUDETG5Y2VE/ 
 
https://gitee.com/openeuler/kernel/issues/IB7V02 
 
Link:https://gitee.com/openeuler/kernel/pulls/14036

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 31093c04 19c20c35

fs/xfs/xfs_mount.c

+2 −2
Original line number Diff line number Diff line
@@ -1259,8 +1259,8 @@ xfs_mod_fdblocks( 
	bool			rsvd)

{

	int64_t			lcounter;

	long long		res_used;

	s32			batch;

	uint64_t		res_used;

	uint64_t		set_aside;



	if (delta > 0) {
@@ -1274,7 +1274,7 @@ xfs_mod_fdblocks( 
		}



		spin_lock(&mp->m_sb_lock);

		res_used = (long long)(mp->m_resblks - mp->m_resblks_avail);

		res_used = mp->m_resblks - mp->m_resblks_avail;



		if (res_used > delta) {

			mp->m_resblks_avail += delta;