ntfs: fix index walk NULL deref and WSL symlink leak
Subsystems (2)
cover ntfs: fix index walk NULL deref and WSL symlink leak
Two independent fixes for the new fs/ntfs/ that landed in v7.1-rc1.
1/2 fixes a NULL dereference in ntfs_index_walk_down(). When
kvzalloc() for ictx->ib fails, or ntfs_ib_read() fails mid traversal, the function previously returned a state that ntfs_index_next() and ntfs_readdir() could not distinguish from end-of-directory, and ntfs_ib_read() itself could write through a NULL ictx->ib. Errors are now propagated as ERR_PTR() through ntfs_index_next() up to ntfs_readdir(). Reproduced with failslab fault injection on getdents64; the reproducer is described in the commit log.
2/2 fixes a target-string leak in ntfs_reparse_set_wsl_symlink()
when ntfs_set_ntfs_reparse_data() fails. Also switches the kvfree() on the local failure path to kfree() to match the kmalloc() done by ntfs_ucstonls().
The two patches are independent and may be applied in any order.
DaeMyung Kang (2):
ntfs: fix NULL dereference in ntfs_index_walk_down()
ntfs: fix WSL symlink target leak on reparse failure
fs/ntfs/dir.c | 13 ++++++++++--- fs/ntfs/index.c | 17 +++++++++++++---- fs/ntfs/reparse.c | 5 +++-- 3 files changed, 26 insertions(+), 9 deletions(-)
--
2.43.0
PATCH 1/2 ntfs: fix NULL dereference in ntfs_index_walk_down()
ntfs_index_walk_down() allocates ictx->ib when descending from the root into an index allocation block. If that allocation fails, the old code still passes the NULL buffer to ntfs_ib_read(), which can write through it via ntfs_inode_attr_pread().
Allocate the index block into a temporary pointer and return -ENOMEM before changing the index context on allocation failure. Also propagate ERR_PTR() through ntfs_index_next() and ntfs_readdir() so walk-down allocation or index block read failures are not mistaken for normal index iteration inside the filesystem.
ntfs_readdir() keeps the existing userspace-visible behavior of suppressing readdir errors after marking end_in_iterate; this change only prevents the walk-down failure path from dereferencing NULL internally.
The failure was reproduced with failslab fail-nth injection on getdents64; the original module hits a NULL pointer dereference in memcpy_orig through ntfs_ib_read(), while the patched module reaches the same ntfs_index_walk_down() allocation failure without crashing.
--- fs/ntfs/dir.c | 13 ++++++++++--- fs/ntfs/index.c | 17 +++++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-)
fs/ntfs/dir.c +10 -3
@@ -911,8 +911,8 @@ static int ntfs_readdir(struct file *file, struct dir_context *actor)if (next->flags &INDEX_ENTRY_NODE ) { next =ntfs_index_walk_down (next, ictx); -if (!next) { - err = -EIO ; +if (IS_ERR (next)) { + err =PTR_ERR (next); goto out; } }
@@ -920,7 +920,14 @@ static int ntfs_readdir(struct file *file, struct dir_context *actor)if (next && !(next->flags &INDEX_ENTRY_END )) goto nextdir; -while ((next =ntfs_index_next (next, ictx)) !=NULL ) { +while (1 ) { + next =ntfs_index_next (next, ictx); +if (IS_ERR (next)) { + err =PTR_ERR (next); + goto out; + } +if (!next) +break ; nextdir:/* Check the consistency of an index entry */ if (ntfs_index_entry_inconsistent(ictx, vol, next, COLLATION_FILE_NAME,
fs/ntfs/index.c +13 -4
@@ -1969,15 +1969,19 @@ int ntfs_index_remove(struct ntfs_inode *dir_ni, const void *key, const u32 keylstruct index_entry *ntfs_index_walk_down (struct index_entry *ie,struct ntfs_index_context *ictx) {struct index_entry *entry; +struct index_block *ib;s64 vcn; entry = ie; do { vcn = ntfs_ie_get_vcn(entry); if (ictx->is_in_root) { + ib = kvzalloc(ictx->block_size, GFP_NOFS); + if (!ib) + return ERR_PTR(-ENOMEM); /* down from level zero */ ictx->ir = NULL; - ictx->ib = kvzalloc(ictx->block_size, GFP_NOFS); + ictx->ib = ib; ictx->pindex = 1; ictx->is_in_root = false; } else {
@@ -1991,8 +1995,8 @@ struct index_entry *ntfs_index_walk_down(struct index_entry *ie, struct ntfs_ind ictx->entry =ntfs_ie_get_first (&ictx->ib->index); entry = ictx->entry; }else - entry =NULL ; - }while (entry && (entry->flags &INDEX_ENTRY_NODE )); + entry =ERR_PTR (-EIO ); + }while (!IS_ERR_OR_NULL (entry) && (entry->flags &INDEX_ENTRY_NODE ));return entry; }
@@ -2097,10 +2101,15 @@ struct index_entry *ntfs_index_next(struct index_entry *ie, struct ntfs_index_co/* walk down if it has a subnode */ if (flags &INDEX_ENTRY_NODE ) { -if (!ictx->ia_ni) +if (!ictx->ia_ni) { ictx->ia_ni =ntfs_ia_open (ictx, ictx->idx_ni); +if (!ictx->ia_ni) +return ERR_PTR (-EIO ); + } next =ntfs_index_walk_down (next, ictx); +if (IS_ERR (next)) +return next; }else {/* walk up it has no subnode, nor data */
Signature · 1 line
2.43.0
Namjae Jeon
maintainerRe: [PATCH 1/2] ntfs: fix NULL dereference in ntfs_index_walk_down()
fs/ntfs/index.c struct index_entry *ntfs_index_walk_down(struct index_entry *ie, struct ntfs_ind · line 1999
Quoted 8 lines
fs/ntfs/index.c +2
-2@@ -1991,8 +1995,8 @@ struct index_entry *ntfs_index_walk_down(struct index_entry *ie, struct ntfs_ind ictx->entry =ntfs_ie_get_first (&ictx->ib->index); entry = ictx->entry; }else - entry =NULL ; - }while (entry && (entry->flags &INDEX_ENTRY_NODE )); + entry =ERR_PTR (-EIO ); + }while (!IS_ERR_OR_NULL (entry) && (entry->flags &INDEX_ENTRY_NODE ));
Is there any reason why you use IS_ERR_OR_NULL(), not IS_ERR() ?
Thanks.
Re: [PATCH 1/2] ntfs: fix NULL dereference in ntfs_index_walk_down()
In reply to DaeMyung KangQuoted 1 line · Namjae Jeon
Is there any reason why you use
IS_ERR_OR_NULL(), notIS_ERR()?
No good reason -- that was over-defensive on my part. Inside the loop, entry is only set to one of:
- ie, the caller's argument (both call sites pass a pointer arithmetic result that cannot be NULL),
- ntfs_ie_get_first(&ictx->ib->index), which is also pointer
arithmetic on ictx->ib that we just checked non-NULL above,
- ERR_PTR(-EIO) on ntfs_ib_read() failure.
So entry is never NULL inside the loop body. I'll switch to plain IS_ERR() in v2.
Thanks,
DaeMyung
PATCH 2/2 ntfs: fix WSL symlink target leak on reparse failure
In reply to DaeMyung Kangntfs_reparse_set_wsl_symlink() converts the symlink target into an allocated NLS string and transfers ownership to ni->target only after ntfs_set_ntfs_reparse_data() succeeds. If setting the reparse data fails, the converted target is left unreferenced and leaks.
Free the converted target on the reparse update failure path. Use kfree() for the other local failure path as well, matching the ntfs_ucstonls() allocation contract.
--- fs/ntfs/reparse.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/ntfs/reparse.c +3 -2
@@ -505,7 +505,6 @@ int ntfs_reparse_set_wsl_symlink(struct ntfs_inode *ni,struct reparse_point *reparse;struct wsl_link_reparse_data *data; - utarget = (char *)NULL ; len =ntfs_ucstonls (ni->vol, target, target_len, &utarget,0 );if (len <=0 )return -EINVAL ;
@@ -514,7 +513,7 @@ int ntfs_reparse_set_wsl_symlink(struct ntfs_inode *ni, reparse =kvzalloc (reparse_len,GFP_NOFS );if (!reparse) { err = -ENOMEM ; -kvfree (utarget); +kfree (utarget); }else { data = (struct wsl_link_reparse_data *)reparse->reparse_data; reparse->reparse_tag =IO_REPARSE_TAG_LX_SYMLINK ;
@@ -528,6 +527,8 @@ int ntfs_reparse_set_wsl_symlink(struct ntfs_inode *ni,kvfree (reparse);if (!err) ni->target = utarget; +else +kfree (utarget); }return err; }
Signature · 1 line
2.43.0