Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jun 2018 22:57:04 +0000 (15:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jun 2018 22:57:04 +0000 (15:57 -0700)
commitba1b7309fc2e909a5828c36a7cd187e5d7df6f53
treee1d65408b3be4a85db47c5d4507dc5e52b997a1b
parent294248e9fb46cb1342ac18fc2fb5fad0b7e3b3b1
parent2531a0cd2dd9dc2b0da9fabb950e2db308ce78b8
Merge branch 'next-smack' of git://git./linux/kernel/git/jmorris/linux-security

Pull smack update from James Morris:
 "From Casey:

    One simple patch that fixes a memory leak in kernfs and labeled NFS"

* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Smack: Fix memory leak in smack_inode_getsecctx