tree c41f725c2440cfc5d2f12e36c71c1af1e4649324
parent 3c29548f87f9545f2f3c1cd1a784fae8ad2d53ba
parent d19dfe58b7ecbef3bd0c403c650200c57913ba1b
author Linus Torvalds <torvalds@linux-foundation.org> 1517433022 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1517433022 -0800

Merge branch 'next-smack' of git://git.kernel.org/pub/scm/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