Commit 1ca5b2ca authored by Dan Carpenter's avatar Dan Carpenter Committed by Jialin Zhang
Browse files

fs/ntfs3: Delete duplicate condition in ntfs_read_mft() 

mainline inclusion
from mainline-v6.2-rc1
commit 65801516
category: bugfix
bugzilla: 188526, https://gitee.com/src-openeuler/kernel/issues/I71SYO
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=658015167a8432b88f5d032e9d85d8fd50e5bf2c



--------------------------------

There were two patches which addressed the same bug and added the same
condition:

commit 6db62086 ("fs/ntfs3: Validate data run offset")
commit 887bfc54 ("fs/ntfs3: Fix slab-out-of-bounds read in run_unpack")

Delete one condition.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Signed-off-by: default avatarZhaoLong Wang <wangzhaolong1@huawei.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent cf4fe9cf

fs/ntfs3/inode.c

+0 −6
Original line number Diff line number Diff line
@@ -380,12 +380,6 @@ static struct inode *ntfs_read_mft(struct inode *inode, 


	t64 = le64_to_cpu(attr->nres.svcn);



	/* offset to packed runs is out-of-bounds */

	if (roff > asize) {

		err = -EINVAL;

		goto out;

	}



	err = run_unpack_ex(run, sbi, ino, t64, le64_to_cpu(attr->nres.evcn),

			    t64, Add2Ptr(attr, roff), asize - roff);

	if (err < 0)