mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
ntfs: do not dereference a null ctx on error
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. Signed-off-by: Danila Chernetsov <listdansp@mail.ru> Reviewed-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
parent
6405fee9b0
commit
aa4b92c523
@ -1955,36 +1955,38 @@ undo_alloc:
|
||||
"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);
|
||||
}
|
||||
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 "
|
||||
"context.%s", es);
|
||||
NVolSetErrors(vol);
|
||||
}
|
||||
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 "
|
||||
"context.%s", es);
|
||||
NVolSetErrors(vol);
|
||||
}
|
||||
if (ctx)
|
||||
ntfs_attr_put_search_ctx(ctx);
|
||||
}
|
||||
if (!IS_ERR(mrec))
|
||||
unmap_mft_record(mft_ni);
|
||||
up_write(&mft_ni->runlist.lock);
|
||||
|
Loading…
Reference in New Issue
Block a user