Commit 2531a0cd authored by James Morris's avatar James Morris
Browse files

Merge branch 'smack-for-4.18' of https://github.com/cschaufler/next-smack into next-smack 

"one simple patch that fixes a memory leak in kernfs and labeled NFS"
parents 890e2abe 0f8983cf

security/smack/smack_lsm.c

+5 −7
Original line number Diff line number Diff line
@@ -1545,9 +1545,9 @@ static int smack_inode_listsecurity(struct inode *inode, char *buffer, 
 */

static void smack_inode_getsecid(struct inode *inode, u32 *secid)

{

	struct inode_smack *isp = inode->i_security;

	struct smack_known *skp = smk_of_inode(inode);



	*secid = isp->smk_inode->smk_secid;

	*secid = skp->smk_secid;

}



/*
@@ -4559,12 +4559,10 @@ static int smack_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen) 


static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)

{

	int len = 0;

	len = smack_inode_getsecurity(inode, XATTR_SMACK_SUFFIX, ctx, true);

	struct smack_known *skp = smk_of_inode(inode);



	if (len < 0)

		return len;

	*ctxlen = len;

	*ctx = skp->smk_known;

	*ctxlen = strlen(skp->smk_known);

	return 0;

}