fs/ntfs3: Delete duplicate condition in ntfs_read_mft()
authorDan Carpenter <dan.carpenter@oracle.com>
Sat, 15 Oct 2022 08:28:55 +0000 (11:28 +0300)
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Sat, 12 Nov 2022 17:59:45 +0000 (20:59 +0300)
There were two patches which addressed the same bug and added the same
condition:

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

Delete one condition.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
fs/ntfs3/inode.c

index 3977e98..763dd98 100644 (file)
@@ -381,12 +381,6 @@ attr_unpack_run:
 
        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)