From: Konstantin Komarovc <almaz.alexandrovich@paragon-software.com>
To: <ntfs3@lists.linux.dev>
Cc: <linux-kernel@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 15/16] fs/ntfs3: Add NULL ptr dereference checking at the end of attr_allocate_frame()
Date: Wed, 6 Dec 2023 18:14:24 +0300 [thread overview]
Message-ID: <f876d196-bfeb-4b0d-bb10-dc793717db49@paragon-software.com> (raw)
In-Reply-To: <00fd1558-fda5-421b-be43-7de69e32cb4e@paragon-software.com>
It is preferable to exit through the out: label because
internal debugging functions are located there.
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
---
fs/ntfs3/attrib.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/fs/ntfs3/attrib.c b/fs/ntfs3/attrib.c
index 4b78b669a3bd..646e2dad1b75 100644
--- a/fs/ntfs3/attrib.c
+++ b/fs/ntfs3/attrib.c
@@ -1743,8 +1743,10 @@ int attr_allocate_frame(struct ntfs_inode *ni,
CLST frame, size_t compr_size,
le_b = NULL;
attr_b = ni_find_attr(ni, NULL, &le_b, ATTR_DATA, NULL,
0, NULL, &mi_b);
- if (!attr_b)
- return -ENOENT;
+ if (!attr_b) {
+ err = -ENOENT;
+ goto out;
+ }
attr = attr_b;
le = le_b;
@@ -1825,13 +1827,15 @@ int attr_allocate_frame(struct ntfs_inode *ni,
CLST frame, size_t compr_size,
ok:
run_truncate_around(run, vcn);
out:
- if (new_valid > data_size)
- new_valid = data_size;
+ if (attr_b) {
+ if (new_valid > data_size)
+ new_valid = data_size;
- valid_size = le64_to_cpu(attr_b->nres.valid_size);
- if (new_valid != valid_size) {
- attr_b->nres.valid_size = cpu_to_le64(valid_size);
- mi_b->dirty = true;
+ valid_size = le64_to_cpu(attr_b->nres.valid_size);
+ if (new_valid != valid_size) {
+ attr_b->nres.valid_size = cpu_to_le64(valid_size);
+ mi_b->dirty = true;
+ }
}
return err;
--
2.34.1
next prev parent reply other threads:[~2023-12-06 15:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-06 15:08 [PATCH 00/16] fs/ntfs3: Bugfix and refactoring Konstantin Komarovc
2023-12-06 15:08 ` [PATCH 01/16] fs/ntfs3: Improve alternative boot processing Konstantin Komarovc
2023-12-06 15:09 ` [PATCH 02/16] fs/ntfs3: Modified fix directory element type detection Konstantin Komarovc
2023-12-06 15:10 ` [PATCH 03/16] fs/ntfs3: Improve ntfs_dir_count Konstantin Komarovc
2023-12-06 15:10 ` [PATCH 04/16] fs/ntfs3: Correct hard links updating when dealing with DOS neams Konstantin Komarovc
2023-12-06 15:11 ` [PATCH 05/16] fs/ntfs3: Print warning while fixing hard links count Konstantin Komarovc
2023-12-06 15:11 ` [PATCH 06/16] fs/ntfs3: Reduce stack usage Konstantin Komarovc
2023-12-06 15:12 ` [PATCH 07/16] fs/ntfs3: Fix multithreaded stress test Konstantin Komarovc
2023-12-06 15:12 ` [PATCH 08/16] fs/ntfs3: Fix detected field-spanning write (size 8) of single field "le->name" Konstantin Komarovc
2023-12-07 9:31 ` Geert Uytterhoeven
2023-12-06 15:12 ` [PATCH 09/16] fs/ntfs3: Correct use bh_read Konstantin Komarovc
2023-12-06 15:12 ` [PATCH 10/16] fs/ntfs3: Add file_modified Konstantin Komarovc
2023-12-06 15:13 ` [PATCH 11/16] fs/ntfs3: Drop suid and sgid bits as a part of fpunch Konstantin Komarovc
2023-12-06 15:13 ` [PATCH 12/16] fs/ntfs3: Implement super_operations::shutdown Konstantin Komarovc
2023-12-06 15:13 ` [PATCH 13/16] fs/ntfs3: ntfs3_forced_shutdown use int instead of bool Konstantin Komarovc
2023-12-06 15:14 ` [PATCH 14/16] fs/ntfs3: Add and fix comments Konstantin Komarovc
2023-12-06 15:14 ` Konstantin Komarovc [this message]
2023-12-06 15:14 ` [PATCH 16/16] fs/ntfs3: Fix c/mtime typo Konstantin Komarovc
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=f876d196-bfeb-4b0d-bb10-dc793717db49@paragon-software.com \
--to=almaz.alexandrovich@paragon-software.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
/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