Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cef9d9ac authored by Gao Xiang's avatar Gao Xiang Committed by Greg Kroah-Hartman
Browse files

nfs: fix acl memory leak of posix_acl_create() 



[ 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: 013cdf10 ("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: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ae0d3b65

fs/nfs/nfs3proc.c

+2 −2
Original line number Diff line number Diff line
@@ -363,7 +363,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);
@@ -708,7 +708,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);