]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jul 2016 03:56:09 +0000 (20:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jul 2016 03:56:09 +0000 (20:56 -0700)
commiteb67ab7ea333b31466dbdc0147af68aeaf98ad86
treee0f8000cc390e1744e823a5b04ed0f593210fb79
parent3cfb79bcd58adcc83d097c95b6041eeadb60c1a2
parent5cb91081085f8f60456cd8a8f7690e73df5a68d1
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull apparmor fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  apparmor: fix oops, validate buffer size in apparmor_setprocattr()