xfs: fix memory leak in xfs_dir2_node_removename
PATCH v3 1/1 xfs: fix memory leak in xfs_dir2_node_removename
Fix the leak of kernel memory in xfs_dir2_node_removename() when xfs_dir2_leafn_remove() returns an error code.
---
v3 change error logic and goto label names
v2 corrected bad return code as pointed out by Roger Willcocks. Found by Coverity (134681) in userspace.
fs/xfs/xfs_dir2_node.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
fs/xfs/xfs_dir2_node.c +13 -13
@@ -2105,12 +2105,12 @@ xfs_dir2_node_lookup(*/ int /* error */ xfs_dir2_node_removename ( -xfs_da_args_t *args)/* operation arguments */ +struct xfs_da_args *args)/* operation arguments */ { -xfs_da_state_blk_t *blk;/* leaf block */ +struct xfs_da_state_blk *blk;/* leaf block */ int error;/* error return value */ int rval;/* operation return value */ -xfs_da_state_t *state;/* btree cursor */ +struct xfs_da_state *state;/* btree cursor */ trace_xfs_dir2_node_removename (args);
@@ -2122,19 +2122,18 @@ xfs_dir2_node_removename( state->mp = args->dp->i_mount; state->blocksize = state->mp->m_dirblksize; state->node_ents = state->mp->m_dir_node_ents; -/* -* Look up the entry we're deleting, set up the cursor. -*/ + +/* Look up the entry we're deleting, set up the cursor. */ error =xfs_da3_node_lookup_int (state, &rval);if (error) - rval = error; -/* -* Didn't find it, upper layer screwed up. -*/ + goto out_free; + +/* Didn't find it, upper layer screwed up. */ if (rval !=EEXIST ) { -xfs_da_state_free (state); -return rval; + error = rval; + goto out_free; } + blk = &state->path.blk[state->path.active -1 ];ASSERT (blk->magic ==XFS_DIR2_LEAFN_MAGIC );ASSERT (state->extravalid);
@@ -2145,7 +2144,7 @@ xfs_dir2_node_removename( error =xfs_dir2_leafn_remove (args, blk->bp, blk->index, &state->extrablk, &rval);if (error) -return error; + goto out_free;/* * Fix the hash values up the btree. */
@@ -2160,6 +2159,7 @@ xfs_dir2_node_removename(*/ if (!error) error =xfs_dir2_node_to_leaf (state); +out_free:xfs_da_state_free (state);return error; }
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 4 lines · Mark Tinguely
Fix the leak of kernel memory in
xfs_dir2_node_removename()whenxfs_dir2_leafn_remove()returns an error code.Signed-off-by Mark Tinguely <[email protected]>
Looks good.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Ben Myers
AppliedQuoted 9 lines · Ben Myers
Quoted 4 lines · Mark Tinguely
Fix the leak of kernel memory in
xfs_dir2_node_removename()whenxfs_dir2_leafn_remove()returns an error code.Signed-off-by Mark Tinguely <[email protected]>Looks good.
Reviewed-by Ben Myers <[email protected]>
Applied this one. Rich, I think there are xfsprogs bits to go with.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs