Merge branch 'fixes-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Oct 2017 16:21:58 +0000 (09:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Oct 2017 16:21:58 +0000 (09:21 -0700)
commit6c795b30f46ff7efec0039095045c2012416670e
tree5c336215e9356d856d3adf130bdb3078028a485c
parent013a8ee6284280f8032cadfec37bcc3cfbfff81b
parent57e7ba04d422c3d41c8426380303ec9b7533ded9
Merge branch 'fixes-v4.14-rc4' of git://git./linux/kernel/git/jmorris/linux-security

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