* [PATCH] fs: ntfs3: Fix possible null-pointer dereferences in mi_read()
@ 2023-03-21 13:22 Jia-Ju Bai
2023-05-08 12:57 ` Konstantin Komarov
0 siblings, 1 reply; 2+ messages in thread
From: Jia-Ju Bai @ 2023-03-21 13:22 UTC (permalink / raw)
To: almaz.alexandrovich; +Cc: ntfs3, linux-kernel, Jia-Ju Bai
In a previous commit 2681631c2973 ("fs/ntfs3: Add null pointer check to
attr_load_runs_vcn"), ni can be NULL in attr_load_runs_vcn(), and thus it
should be checked before being used.
However, in the call stack of this commit, mft_ni in mi_read() is
aliased with ni in attr_load_runs_vcn(), and it is also used in
mi_read() at two places:
mi_read()
rw_lock = &mft_ni->file.run_lock -> No check
attr_load_runs_vcn(mft_ni, ...)
ni (namely mft_ni) is checked in the previous commit
attr_load_runs_vcn(..., &mft_ni->file.run) -> No check
Thus, to avoid possible null-pointer dereferences, the related checks
should be added.
These bugs are reported by a static analysis tool implemented by myself,
and they are found by extending a known bug fixed in the previous commit.
Thus, they could be theoretical bugs.
Signed-off-by: Jia-Ju Bai <baijiaju@buaa.edu.cn>
---
fs/ntfs3/record.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/ntfs3/record.c b/fs/ntfs3/record.c
index defce6a5c8e1..dfa1fed9c0d9 100644
--- a/fs/ntfs3/record.c
+++ b/fs/ntfs3/record.c
@@ -124,7 +124,7 @@ int mi_read(struct mft_inode *mi, bool is_mft)
struct rw_semaphore *rw_lock = NULL;
if (is_mounted(sbi)) {
- if (!is_mft) {
+ if (!is_mft && mft_ni) {
rw_lock = &mft_ni->file.run_lock;
down_read(rw_lock);
}
@@ -148,7 +148,7 @@ int mi_read(struct mft_inode *mi, bool is_mft)
ni_lock(mft_ni);
down_write(rw_lock);
}
- err = attr_load_runs_vcn(mft_ni, ATTR_DATA, NULL, 0, &mft_ni->file.run,
+ err = attr_load_runs_vcn(mft_ni, ATTR_DATA, NULL, 0, run,
vbo >> sbi->cluster_bits);
if (rw_lock) {
up_write(rw_lock);
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] fs: ntfs3: Fix possible null-pointer dereferences in mi_read()
2023-03-21 13:22 [PATCH] fs: ntfs3: Fix possible null-pointer dereferences in mi_read() Jia-Ju Bai
@ 2023-05-08 12:57 ` Konstantin Komarov
0 siblings, 0 replies; 2+ messages in thread
From: Konstantin Komarov @ 2023-05-08 12:57 UTC (permalink / raw)
To: Jia-Ju Bai; +Cc: ntfs3, linux-kernel
On 21.03.2023 17:22, Jia-Ju Bai wrote:
> In a previous commit 2681631c2973 ("fs/ntfs3: Add null pointer check to
> attr_load_runs_vcn"), ni can be NULL in attr_load_runs_vcn(), and thus it
> should be checked before being used.
>
> However, in the call stack of this commit, mft_ni in mi_read() is
> aliased with ni in attr_load_runs_vcn(), and it is also used in
> mi_read() at two places:
>
> mi_read()
> rw_lock = &mft_ni->file.run_lock -> No check
> attr_load_runs_vcn(mft_ni, ...)
> ni (namely mft_ni) is checked in the previous commit
> attr_load_runs_vcn(..., &mft_ni->file.run) -> No check
>
> Thus, to avoid possible null-pointer dereferences, the related checks
> should be added.
>
> These bugs are reported by a static analysis tool implemented by myself,
> and they are found by extending a known bug fixed in the previous commit.
> Thus, they could be theoretical bugs.
>
> Signed-off-by: Jia-Ju Bai <baijiaju@buaa.edu.cn>
> ---
> fs/ntfs3/record.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ntfs3/record.c b/fs/ntfs3/record.c
> index defce6a5c8e1..dfa1fed9c0d9 100644
> --- a/fs/ntfs3/record.c
> +++ b/fs/ntfs3/record.c
> @@ -124,7 +124,7 @@ int mi_read(struct mft_inode *mi, bool is_mft)
> struct rw_semaphore *rw_lock = NULL;
>
> if (is_mounted(sbi)) {
> - if (!is_mft) {
> + if (!is_mft && mft_ni) {
> rw_lock = &mft_ni->file.run_lock;
> down_read(rw_lock);
> }
> @@ -148,7 +148,7 @@ int mi_read(struct mft_inode *mi, bool is_mft)
> ni_lock(mft_ni);
> down_write(rw_lock);
> }
> - err = attr_load_runs_vcn(mft_ni, ATTR_DATA, NULL, 0, &mft_ni->file.run,
> + err = attr_load_runs_vcn(mft_ni, ATTR_DATA, NULL, 0, run,
> vbo >> sbi->cluster_bits);
> if (rw_lock) {
> up_write(rw_lock);
Thanks, your patch has been applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-08 12:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-21 13:22 [PATCH] fs: ntfs3: Fix possible null-pointer dereferences in mi_read() Jia-Ju Bai
2023-05-08 12:57 ` Konstantin Komarov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).