Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Jan 2018 21:10:22 +0000 (13:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Jan 2018 21:10:22 +0000 (13:10 -0800)
commit2a7149031457c5dd05f670737a9dd5d32524f145
treec41f725c2440cfc5d2f12e36c71c1af1e4649324
parent3c29548f87f9545f2f3c1cd1a784fae8ad2d53ba
parentd19dfe58b7ecbef3bd0c403c650200c57913ba1b
Merge branch 'next-smack' of git://git./linux/kernel/git/jmorris/linux-security

Pull smack updates from James Morris:
 "Two minor fixes"

* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Smack: Privilege check on key operations
  Smack: fix dereferenced before check