diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2022-10-15 11:28:55 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-04 11:28:57 +0100 |
| commit | 4d744cee4ca1fbd843c50e77d52f3398bc5ff166 (patch) | |
| tree | a1f79ef2613508b9353aec11cb293e2560c39f38 | |
| parent | fd8aa71b65710ddbe3698892850d7e576fc23acb (diff) | |
| download | linux-4d744cee4ca1fbd843c50e77d52f3398bc5ff166.tar.gz | |
fs/ntfs3: Delete duplicate condition in ntfs_read_mft()
[ Upstream commit 658015167a8432b88f5d032e9d85d8fd50e5bf2c ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | fs/ntfs3/inode.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c index d98d047c778c..e352aa37330c 100644 --- a/fs/ntfs3/inode.c +++ b/fs/ntfs3/inode.c @@ -374,12 +374,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) |