* [PATCH] ntfs: do not dereference a null ctx on error
@ 2013-01-17 2:28 Nickolai Zeldovich
0 siblings, 0 replies; 4+ messages in thread
From: Nickolai Zeldovich @ 2013-01-17 2:28 UTC (permalink / raw)
To: Anton Altaparmakov; +Cc: Nickolai Zeldovich, linux-ntfs-dev, linux-kernel
In ntfs_mft_data_extend_allocation_nolock(), if an error condition occurs
prior to 'ctx' being set to a non-NULL value, avoid dereferencing the NULL
'ctx' pointer by jumping to later cleanup code.
Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu>
---
fs/ntfs/mft.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 3014a36..e6ea11c 100644
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -1822,13 +1822,13 @@ static int ntfs_mft_data_extend_allocation_nolock(ntfs_volume *vol)
if (IS_ERR(mrec)) {
ntfs_error(vol->sb, "Failed to map mft record.");
ret = PTR_ERR(mrec);
- goto undo_alloc;
+ goto undo_alloc_noctx;
}
ctx = ntfs_attr_get_search_ctx(mft_ni, mrec);
if (unlikely(!ctx)) {
ntfs_error(vol->sb, "Failed to get search context.");
ret = -ENOMEM;
- goto undo_alloc;
+ goto undo_alloc_noctx;
}
ret = ntfs_attr_lookup(mft_ni->type, mft_ni->name, mft_ni->name_len,
CASE_SENSITIVE, rl[1].vcn, NULL, 0, ctx);
@@ -1988,8 +1988,8 @@ undo_alloc:
"context.%s", es);
NVolSetErrors(vol);
}
- if (ctx)
- ntfs_attr_put_search_ctx(ctx);
+ ntfs_attr_put_search_ctx(ctx);
+undo_alloc_noctx:
if (!IS_ERR(mrec))
unmap_mft_record(mft_ni);
up_write(&mft_ni->runlist.lock);
--
1.7.10.4
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] ntfs: do not dereference a null ctx on error
@ 2023-04-07 19:44 Danila Chernetsov
2023-05-05 6:20 ` Namjae Jeon
2023-05-06 0:52 ` Namjae Jeon
0 siblings, 2 replies; 4+ messages in thread
From: Danila Chernetsov @ 2023-04-07 19:44 UTC (permalink / raw)
To: Anton Altaparmakov
Cc: Danila Chernetsov, linux-ntfs-dev, linux-kernel, lvc-project
In ntfs_mft_data_extend_allocation_nolock(), if an error condition occurs
prior to 'ctx' being set to a non-NULL value, avoid dereferencing the NULL
'ctx' pointer in error handling.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Danila Chernetsov <listdansp@mail.ru>
---
fs/ntfs/mft.c | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 48030899dc6e..e1126ce6f8ec 100644
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -1955,36 +1955,40 @@ static int ntfs_mft_data_extend_allocation_nolock(ntfs_volume *vol)
"attribute.%s", es);
NVolSetErrors(vol);
}
- a = ctx->attr;
+
if (ntfs_rl_truncate_nolock(vol, &mft_ni->runlist, old_last_vcn)) {
ntfs_error(vol->sb, "Failed to truncate mft data attribute "
"runlist.%s", es);
NVolSetErrors(vol);
}
- if (mp_rebuilt && !IS_ERR(ctx->mrec)) {
- if (ntfs_mapping_pairs_build(vol, (u8*)a + le16_to_cpu(
+ if (ctx) {
+ a = ctx->attr;
+ if (mp_rebuilt && !IS_ERR(ctx->mrec)) {
+ if (ntfs_mapping_pairs_build(vol, (u8*)a + le16_to_cpu(
a->data.non_resident.mapping_pairs_offset),
old_alen - le16_to_cpu(
- a->data.non_resident.mapping_pairs_offset),
+ a->data.non_resident.mapping_pairs_offset),
rl2, ll, -1, NULL)) {
- ntfs_error(vol->sb, "Failed to restore mapping pairs "
+ ntfs_error(vol->sb, "Failed to restore mapping pairs "
"array.%s", es);
- NVolSetErrors(vol);
- }
- if (ntfs_attr_record_resize(ctx->mrec, a, old_alen)) {
- ntfs_error(vol->sb, "Failed to restore attribute "
+ NVolSetErrors(vol);
+ }
+ if (ntfs_attr_record_resize(ctx->mrec, a, old_alen)) {
+ ntfs_error(vol->sb, "Failed to restore attribute "
"record.%s", es);
- NVolSetErrors(vol);
+ NVolSetErrors(vol);
+ }
+ flush_dcache_mft_record_page(ctx->ntfs_ino);
+ mark_mft_record_dirty(ctx->ntfs_ino);
}
- flush_dcache_mft_record_page(ctx->ntfs_ino);
- mark_mft_record_dirty(ctx->ntfs_ino);
- } else if (IS_ERR(ctx->mrec)) {
- ntfs_error(vol->sb, "Failed to restore attribute search "
+ else if (IS_ERR(ctx->mrec)) {
+ ntfs_error(vol->sb, "Failed to restore attribute search "
"context.%s", es);
- NVolSetErrors(vol);
+ NVolSetErrors(vol);
+ }
+ if (ctx)
+ ntfs_attr_put_search_ctx(ctx);
}
- if (ctx)
- ntfs_attr_put_search_ctx(ctx);
if (!IS_ERR(mrec))
unmap_mft_record(mft_ni);
up_write(&mft_ni->runlist.lock);
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ntfs: do not dereference a null ctx on error
2023-04-07 19:44 Danila Chernetsov
@ 2023-05-05 6:20 ` Namjae Jeon
2023-05-06 0:52 ` Namjae Jeon
1 sibling, 0 replies; 4+ messages in thread
From: Namjae Jeon @ 2023-05-05 6:20 UTC (permalink / raw)
To: Danila Chernetsov
Cc: Anton Altaparmakov, linux-ntfs-dev, linux-kernel, lvc-project,
Christian Brauner
2023-04-08 4:44 GMT+09:00, Danila Chernetsov <listdansp@mail.ru>:
> In ntfs_mft_data_extend_allocation_nolock(), if an error condition occurs
> prior to 'ctx' being set to a non-NULL value, avoid dereferencing the NULL
> 'ctx' pointer in error handling.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Signed-off-by: Danila Chernetsov <listdansp@mail.ru>
> ---
> fs/ntfs/mft.c | 38 +++++++++++++++++++++-----------------
> 1 file changed, 21 insertions(+), 17 deletions(-)
>
> diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
> index 48030899dc6e..e1126ce6f8ec 100644
> --- a/fs/ntfs/mft.c
> +++ b/fs/ntfs/mft.c
> @@ -1955,36 +1955,40 @@ static int
> ntfs_mft_data_extend_allocation_nolock(ntfs_volume *vol)
> "attribute.%s", es);
> NVolSetErrors(vol);
> }
> - a = ctx->attr;
> +
> if (ntfs_rl_truncate_nolock(vol, &mft_ni->runlist, old_last_vcn)) {
> ntfs_error(vol->sb, "Failed to truncate mft data attribute "
> "runlist.%s", es);
> NVolSetErrors(vol);
> }
> - if (mp_rebuilt && !IS_ERR(ctx->mrec)) {
> - if (ntfs_mapping_pairs_build(vol, (u8*)a + le16_to_cpu(
> + if (ctx) {
> + a = ctx->attr;
> + if (mp_rebuilt && !IS_ERR(ctx->mrec)) {
> + if (ntfs_mapping_pairs_build(vol, (u8*)a + le16_to_cpu(
> a->data.non_resident.mapping_pairs_offset),
> old_alen - le16_to_cpu(
> - a->data.non_resident.mapping_pairs_offset),
> + a->data.non_resident.mapping_pairs_offset),
> rl2, ll, -1, NULL)) {
> - ntfs_error(vol->sb, "Failed to restore mapping pairs "
> + ntfs_error(vol->sb, "Failed to restore mapping pairs "
> "array.%s", es);
> - NVolSetErrors(vol);
> - }
> - if (ntfs_attr_record_resize(ctx->mrec, a, old_alen)) {
> - ntfs_error(vol->sb, "Failed to restore attribute "
> + NVolSetErrors(vol);
> + }
> + if (ntfs_attr_record_resize(ctx->mrec, a, old_alen)) {
> + ntfs_error(vol->sb, "Failed to restore attribute "
> "record.%s", es);
> - NVolSetErrors(vol);
> + NVolSetErrors(vol);
> + }
> + flush_dcache_mft_record_page(ctx->ntfs_ino);
> + mark_mft_record_dirty(ctx->ntfs_ino);
> }
> - flush_dcache_mft_record_page(ctx->ntfs_ino);
> - mark_mft_record_dirty(ctx->ntfs_ino);
> - } else if (IS_ERR(ctx->mrec)) {
> - ntfs_error(vol->sb, "Failed to restore attribute search "
> + else if (IS_ERR(ctx->mrec)) {
> + ntfs_error(vol->sb, "Failed to restore attribute search "
> "context.%s", es);
> - NVolSetErrors(vol);
> + NVolSetErrors(vol);
> + }
> + if (ctx)
I think that this check is not needed.
> + ntfs_attr_put_search_ctx(ctx);
> }
> - if (ctx)
> - ntfs_attr_put_search_ctx(ctx);
> if (!IS_ERR(mrec))
> unmap_mft_record(mft_ni);
> up_write(&mft_ni->runlist.lock);
> --
> 2.25.1
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ntfs: do not dereference a null ctx on error
2023-04-07 19:44 Danila Chernetsov
2023-05-05 6:20 ` Namjae Jeon
@ 2023-05-06 0:52 ` Namjae Jeon
1 sibling, 0 replies; 4+ messages in thread
From: Namjae Jeon @ 2023-05-06 0:52 UTC (permalink / raw)
To: Danila Chernetsov
Cc: Anton Altaparmakov, linux-ntfs-dev, linux-kernel, lvc-project,
Christian Brauner
2023-04-08 4:44 GMT+09:00, Danila Chernetsov <listdansp@mail.ru>:
> In ntfs_mft_data_extend_allocation_nolock(), if an error condition occurs
> prior to 'ctx' being set to a non-NULL value, avoid dereferencing the NULL
> 'ctx' pointer in error handling.
Please check the warnings from checkpatch.pl.
ERROR: trailing whitespace
#107: FILE: fs/ntfs/mft.c:1958:
+^I$
ERROR: "(foo*)" should be "(foo *)"
#118: FILE: fs/ntfs/mft.c:1967:
+ if (ntfs_mapping_pairs_build(vol, (u8*)a + le16_to_cpu(
ERROR: else should follow close brace '}'
#146: FILE: fs/ntfs/mft.c:1984:
}
+ else if (IS_ERR(ctx->mrec)) {
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Signed-off-by: Danila Chernetsov <listdansp@mail.ru>
> ---
> fs/ntfs/mft.c | 38 +++++++++++++++++++++-----------------
> 1 file changed, 21 insertions(+), 17 deletions(-)
>
> diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
> index 48030899dc6e..e1126ce6f8ec 100644
> --- a/fs/ntfs/mft.c
> +++ b/fs/ntfs/mft.c
> @@ -1955,36 +1955,40 @@ static int
> ntfs_mft_data_extend_allocation_nolock(ntfs_volume *vol)
> "attribute.%s", es);
> NVolSetErrors(vol);
> }
> - a = ctx->attr;
> +
> if (ntfs_rl_truncate_nolock(vol, &mft_ni->runlist, old_last_vcn)) {
> ntfs_error(vol->sb, "Failed to truncate mft data attribute "
> "runlist.%s", es);
> NVolSetErrors(vol);
> }
> - if (mp_rebuilt && !IS_ERR(ctx->mrec)) {
> - if (ntfs_mapping_pairs_build(vol, (u8*)a + le16_to_cpu(
> + if (ctx) {
> + a = ctx->attr;
> + if (mp_rebuilt && !IS_ERR(ctx->mrec)) {
> + if (ntfs_mapping_pairs_build(vol, (u8*)a + le16_to_cpu(
> a->data.non_resident.mapping_pairs_offset),
> old_alen - le16_to_cpu(
> - a->data.non_resident.mapping_pairs_offset),
> + a->data.non_resident.mapping_pairs_offset),
> rl2, ll, -1, NULL)) {
> - ntfs_error(vol->sb, "Failed to restore mapping pairs "
> + ntfs_error(vol->sb, "Failed to restore mapping pairs "
> "array.%s", es);
> - NVolSetErrors(vol);
> - }
> - if (ntfs_attr_record_resize(ctx->mrec, a, old_alen)) {
> - ntfs_error(vol->sb, "Failed to restore attribute "
> + NVolSetErrors(vol);
> + }
> + if (ntfs_attr_record_resize(ctx->mrec, a, old_alen)) {
> + ntfs_error(vol->sb, "Failed to restore attribute "
> "record.%s", es);
> - NVolSetErrors(vol);
> + NVolSetErrors(vol);
> + }
> + flush_dcache_mft_record_page(ctx->ntfs_ino);
> + mark_mft_record_dirty(ctx->ntfs_ino);
> }
> - flush_dcache_mft_record_page(ctx->ntfs_ino);
> - mark_mft_record_dirty(ctx->ntfs_ino);
> - } else if (IS_ERR(ctx->mrec)) {
> - ntfs_error(vol->sb, "Failed to restore attribute search "
> + else if (IS_ERR(ctx->mrec)) {
> + ntfs_error(vol->sb, "Failed to restore attribute search "
> "context.%s", es);
> - NVolSetErrors(vol);
> + NVolSetErrors(vol);
> + }
> + if (ctx)
> + ntfs_attr_put_search_ctx(ctx);
> }
> - if (ctx)
> - ntfs_attr_put_search_ctx(ctx);
> if (!IS_ERR(mrec))
> unmap_mft_record(mft_ni);
> up_write(&mft_ni->runlist.lock);
> --
> 2.25.1
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-06 0:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-17 2:28 [PATCH] ntfs: do not dereference a null ctx on error Nickolai Zeldovich
2023-04-07 19:44 Danila Chernetsov
2023-05-05 6:20 ` Namjae Jeon
2023-05-06 0:52 ` Namjae Jeon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®