From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
Konstantin Komarov <almaz.alexandrovich@paragon-software.com>,
Sasha Levin <sashal@kernel.org>,
ntfs3@lists.linux.dev
Subject: [PATCH AUTOSEL 6.1 17/28] fs/ntfs3: Delete duplicate condition in ntfs_read_mft()
Date: Tue, 27 Dec 2022 15:32:38 -0500 [thread overview]
Message-ID: <20221227203249.1213526-17-sashal@kernel.org> (raw)
In-Reply-To: <20221227203249.1213526-1-sashal@kernel.org>
From: Dan Carpenter <dan.carpenter@oracle.com>
[ 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>
---
fs/ntfs3/inode.c | 6 ------
1 file changed, 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 @@ 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)
--
2.35.1
next prev parent reply other threads:[~2022-12-27 20:34 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-27 20:32 [PATCH AUTOSEL 6.1 01/28] fs/ntfs3: Validate BOOT record_size Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 02/28] fs/ntfs3: Add overflow check for attribute size Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 03/28] fs/ntfs3: Validate data run offset Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 04/28] fs/ntfs3: Add null pointer check to attr_load_runs_vcn Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 05/28] fs/ntfs3: Fix memory leak on ntfs_fill_super() error path Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 06/28] fs/ntfs3: Add null pointer check for inode operations Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 07/28] fs/ntfs3: Validate attribute name offset Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 08/28] fs/ntfs3: Validate buffer length while parsing index Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 09/28] fs/ntfs3: Validate resident attribute name Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 10/28] fs/ntfs3: Fix slab-out-of-bounds read in run_unpack Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 11/28] soundwire: dmi-quirks: add quirk variant for LAPBC710 NUC15 Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 12/28] phy: sun4i-usb: Introduce port2 SIDDQ quirk Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 13/28] phy: sun4i-usb: Add support for the H616 USB PHY Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 14/28] fs/ntfs3: Validate index root when initialize NTFS security Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 15/28] fs/ntfs3: Use __GFP_NOWARN allocation at wnd_init() Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 16/28] fs/ntfs3: Use __GFP_NOWARN allocation at ntfs_fill_super() Sasha Levin
2022-12-27 20:32 ` Sasha Levin [this message]
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 18/28] fs/ntfs3: Fix slab-out-of-bounds in r_page Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 19/28] objtool: Fix SEGFAULT Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 20/28] iommu/mediatek: Fix crash on isr after kexec() Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 21/28] powerpc/rtas: avoid device tree lookups in rtas_os_term() Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 22/28] powerpc/rtas: avoid scheduling " Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 23/28] rtc: msc313: Fix function prototype mismatch in msc313_rtc_probe() Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 24/28] NFSD: fix use-after-free in __nfs42_ssc_open() Sasha Levin
2023-01-23 18:39 ` Oleksandr Tymoshenko
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 25/28] kprobes: kretprobe events missing on 2-core KVM guest Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 26/28] powerpc/msi: Fix deassociation of MSI descriptors Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 27/28] HID: multitouch: fix Asus ExpertBook P2 P2451FA trackpoint Sasha Levin
2022-12-27 20:32 ` [PATCH AUTOSEL 6.1 28/28] HID: plantronics: Additional PIDs for double volume key presses quirk Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221227203249.1213526-17-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=almaz.alexandrovich@paragon-software.com \
--cc=dan.carpenter@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox