GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 05:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fixes-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Browse source 
Pull smack fix from James Morris:
 "It fixes a bug in xattr_getsecurity() where security_release_secctx()
  was being called instead of kfree(), which leads to a memory leak in
  the capabilities code. smack_inode_getsecurity is also fixed to behave
  correctly when called from there"

* 'fixes-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  lsm: fix smack_inode_removexattr and xattr_getsecurity memleak
This commit is contained in:
Linus Torvalds 2017-10-04 09:21:58 -07:00
commit 6c795b30f4
2 changed files with 28 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/xattr.c
View file

@ -250,7 +250,7 @@ xattr_getsecurity(struct inode *inode, const char *name, void *value,
} }
memcpy(value, buffer, len); memcpy(value, buffer, len);
out: out:
security_release_secctx(buffer, len); kfree(buffer);
out_noalloc: out_noalloc:
return len; return len;
} }

25
security/smack/smack_lsm.c
View file

@ -1473,7 +1473,7 @@ static int smack_inode_removexattr(struct dentry *dentry, const char *name)
* @inode: the object * @inode: the object
* @name: attribute name * @name: attribute name
* @buffer: where to put the result * @buffer: where to put the result
* @alloc: unused * @alloc: duplicate memory
* *
* Returns the size of the attribute or an error code * Returns the size of the attribute or an error code
*/ */
@ -1486,16 +1486,10 @@ static int smack_inode_getsecurity(struct inode *inode,
struct super_block *sbp; struct super_block *sbp;
struct inode *ip = (struct inode *)inode; struct inode *ip = (struct inode *)inode;
struct smack_known *isp; struct smack_known *isp;
int ilen;
int rc = 0;
if (strcmp(name, XATTR_SMACK_SUFFIX) == 0) { if (strcmp(name, XATTR_SMACK_SUFFIX) == 0)
isp = smk_of_inode(inode); isp = smk_of_inode(inode);
ilen = strlen(isp->smk_known); else {
*buffer = isp->smk_known;
return ilen;
}
/* /*
* The rest of the Smack xattrs are only on sockets. * The rest of the Smack xattrs are only on sockets.
*/ */
@ -1515,14 +1509,15 @@ static int smack_inode_getsecurity(struct inode *inode,
isp = ssp->smk_out; isp = ssp->smk_out;
else else
return -EOPNOTSUPP; return -EOPNOTSUPP;
ilen = strlen(isp->smk_known);
if (rc == 0) {
*buffer = isp->smk_known;
rc = ilen;
} }
return rc; if (alloc) {
*buffer = kstrdup(isp->smk_known, GFP_KERNEL);
if (*buffer == NULL)
return -ENOMEM;
}
return strlen(isp->smk_known);
} }