lkml.org 
[lkml]   [2010]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [173/223] cifs: fix another memleak, in cifs_root_iget
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: Oskar Schirmer <oskar@scara.com>

    commit a7851ce73b9fdef53f251420e6883cf4f3766534 upstream.

    cifs_root_iget allocates full_path through
    cifs_build_path_to_root, but fails to kfree it upon
    cifs_get_inode_info* failure.

    Make all failure exit paths traverse clean up
    handling at the end of the function.

    Signed-off-by: Oskar Schirmer <oskar@scara.com>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Reviewed-by: Jesper Juhl <jj@chaosbits.net>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/cifs/inode.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    Index: linux/fs/cifs/inode.c
    ===================================================================
    --- linux.orig/fs/cifs/inode.c
    +++ linux/fs/cifs/inode.c
    @@ -804,8 +804,10 @@ struct inode *cifs_root_iget(struct supe
    rc = cifs_get_inode_info(&inode, full_path, NULL, sb,
    xid, NULL);

    - if (!inode)
    - return ERR_PTR(-ENOMEM);
    + if (!inode) {
    + inode = ERR_PTR(rc);
    + goto out;
    + }

    if (rc && cifs_sb->tcon->ipc) {
    cFYI(1, "ipc connection - fake read inode");
    @@ -816,13 +818,11 @@ struct inode *cifs_root_iget(struct supe
    inode->i_uid = cifs_sb->mnt_uid;
    inode->i_gid = cifs_sb->mnt_gid;
    } else if (rc) {
    - kfree(full_path);
    - _FreeXid(xid);
    iget_failed(inode);
    - return ERR_PTR(rc);
    + inode = ERR_PTR(rc);
    }

    -
    +out:
    kfree(full_path);
    /* can not call macro FreeXid here since in a void func
    * TODO: This is no longer true

    \
     
     \ /
      Last update: 2010-12-13 01:01    [W:4.034 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site