Commit 9084ed79 authored by Stephen Smalley's avatar Stephen Smalley Committed by Anna Schumaker
Browse files

lsm,nfs: fix memory leak of lsm_context 



commit b530104f ("lsm: lsm_context in security_dentry_init_security")
did not preserve the lsm id for subsequent release calls, which results
in a memory leak. Fix it by saving the lsm id in the nfs4_label and
providing it on the subsequent release call.

Fixes: b530104f ("lsm: lsm_context in security_dentry_init_security")
Signed-off-by: default avatarStephen Smalley <stephen.smalley.work@gmail.com>
Acked-by: default avatarPaul Moore <paul@paul-moore.com>
Acked-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Signed-off-by: default avatarAnna Schumaker <anna.schumaker@oracle.com>
parent 1f7a4f98

fs/nfs/nfs4proc.c

+4 −3
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry, 
	if (err)

		return NULL;



	label->lsmid = shim.id;

	label->label = shim.context;

	label->len = shim.len;

	return label;
@@ -145,7 +146,7 @@ nfs4_label_release_security(struct nfs4_label *label) 
	if (label) {

		shim.context = label->label;

		shim.len = label->len;

		shim.id = LSM_ID_UNDEF;

		shim.id = label->lsmid;

		security_release_secctx(&shim);

	}

}
@@ -6272,7 +6273,7 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf, 
					size_t buflen)

{

	struct nfs_server *server = NFS_SERVER(inode);

	struct nfs4_label label = {0, 0, buflen, buf};

	struct nfs4_label label = {0, 0, 0, buflen, buf};



	u32 bitmask[3] = { 0, 0, FATTR4_WORD2_SECURITY_LABEL };

	struct nfs_fattr fattr = {
@@ -6377,7 +6378,7 @@ static int nfs4_do_set_security_label(struct inode *inode, 
static int

nfs4_set_security_label(struct inode *inode, const void *buf, size_t buflen)

{

	struct nfs4_label ilabel = {0, 0, buflen, (char *)buf };

	struct nfs4_label ilabel = {0, 0, 0, buflen, (char *)buf };

	struct nfs_fattr *fattr;

	int status;

include/linux/nfs4.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct nfs4_acl { 
struct nfs4_label {

	uint32_t	lfs;

	uint32_t	pi;

	u32		lsmid;

	u32		len;

	char	*label;

};