Commit db44bf4b authored Sep 06, 2018 by Linus Torvalds

Merge tag 'apparmor-pr-2018-09-06' of...

Merge tag 'apparmor-pr-2018-09-06' of git://git.kernel.org/pub/scm/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()

parents be65e259 edf4e7b7

security/apparmor/secid.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,6 @@ int apparmor_secid_to_secctx(u32 secid, char *secdata, u32 seclen)
		struct aa_label *label = aa_secid_to_label(secid);
		int len;

		AA_BUG(!secdata);
		AA_BUG(!seclen);

		if (!label)