xfs
[Top] [All Lists]

[PATCH 1/2] xfs: fix memory leak in xfs_dir2_node_removename

To: xfs@xxxxxxxxxxx
Subject: [PATCH 1/2] xfs: fix memory leak in xfs_dir2_node_removename
From: Mark Tinguely <tinguely@xxxxxxx>
Date: Wed, 02 Oct 2013 07:51:11 -0500
Delivered-to: xfs@xxxxxxxxxxx
References: <20131002125110.745269864@xxxxxxx>
User-agent: quilt/0.51-1
Fix the leak of kernel memory in xfs_dir2_node_removename()
when xfs_dir2_leafn_remove() returns an error code.

Found by Coverity in userspace same patch applies there also.

Signed-off-by: Mark Tinguely <tinguely@xxxxxxx>
---
 v2 corrected bad return code as pointed out by Roger Willcocks.

 fs/xfs/xfs_dir2_node.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Index: b/fs/xfs/xfs_dir2_node.c
===================================================================
--- a/fs/xfs/xfs_dir2_node.c
+++ b/fs/xfs/xfs_dir2_node.c
@@ -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);
 
@@ -2132,9 +2132,10 @@ xfs_dir2_node_removename(
         * Didn't find it, upper layer screwed up.
         */
        if (rval != EEXIST) {
-               xfs_da_state_free(state);
-               return rval;
+               error = rval;
+               goto done;
        }
+
        blk = &state->path.blk[state->path.active - 1];
        ASSERT(blk->magic == XFS_DIR2_LEAFN_MAGIC);
        ASSERT(state->extravalid);
@@ -2145,7 +2146,7 @@ xfs_dir2_node_removename(
        error = xfs_dir2_leafn_remove(args, blk->bp, blk->index,
                &state->extrablk, &rval);
        if (error)
-               return error;
+               goto done;
        /*
         * Fix the hash values up the btree.
         */
@@ -2160,6 +2161,7 @@ xfs_dir2_node_removename(
         */
        if (!error)
                error = xfs_dir2_node_to_leaf(state);
+done:
        xfs_da_state_free(state);
        return error;
 }


<Prev in Thread] Current Thread [Next in Thread>