From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Jan 2018 21:10:22 +0000 (-0800)
Subject: Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2a7149031457c5dd05f670737a9dd5d32524f145;p=openwrt%2Fstaging%2Fblogic.git

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
---

2a7149031457c5dd05f670737a9dd5d32524f145