From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Sep 2018 16:42:14 +0000 (-0700)
Subject: Merge tag 'apparmor-pr-2018-09-06' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=db44bf4b4768a0664d3c9d9000ecb747de31ded8;p=linux.git

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

db44bf4b4768a0664d3c9d9000ecb747de31ded8