lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 388/421] nfs: fix acl memory leak of posix_acl_create()
    Date
    From: Gao Xiang <hsiangkao@linux.alibaba.com>

    [ Upstream commit 1fcb6fcd74a222d9ead54d405842fc763bb86262 ]

    When looking into another nfs xfstests report, I found acl and
    default_acl in nfs3_proc_create() and nfs3_proc_mknod() error
    paths are possibly leaked. Fix them in advance.

    Fixes: 013cdf1088d7 ("nfs: use generic posix ACL infrastructure for v3 Posix ACLs")
    Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
    Cc: Anna Schumaker <anna.schumaker@netapp.com>
    Cc: Christoph Hellwig <hch@infradead.org>
    Cc: Joseph Qi <joseph.qi@linux.alibaba.com>
    Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfs/nfs3proc.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
    index ec8a9efa268f..e302f8370b9b 100644
    --- a/fs/nfs/nfs3proc.c
    +++ b/fs/nfs/nfs3proc.c
    @@ -346,7 +346,7 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
    break;

    case NFS3_CREATE_UNCHECKED:
    - goto out;
    + goto out_release_acls;
    }
    nfs_fattr_init(data->res.dir_attr);
    nfs_fattr_init(data->res.fattr);
    @@ -695,7 +695,7 @@ nfs3_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
    break;
    default:
    status = -EINVAL;
    - goto out;
    + goto out_release_acls;
    }

    status = nfs3_do_create(dir, dentry, data);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-19 19:11    [W:2.054 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site