Merge tag 'apparmor-pr-2018-09-06' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Sep 2018 16:42:14 +0000 (09:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Sep 2018 16:42:14 +0000 (09:42 -0700)
commitdb44bf4b4768a0664d3c9d9000ecb747de31ded8
tree31ac2e04d8189af42d0fdc0da5d799903a38504b
parentbe65e2595b4c1fbeceba336d8ee83406726b1d8d
parentedf4e7b7b9104b58fddfcd073bd7dcc1585d5326
Merge tag 'apparmor-pr-2018-09-06' of git://git./linux/kernel/git/jj/linux-apparmor

Pull apparmor fix from John Johansen:
 "A fix for an issue syzbot discovered last week:

   - Fix for bad debug check when converting secids to secctx"

* tag 'apparmor-pr-2018-09-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: fix bad debug check in apparmor_secid_to_secctx()