Skip to content

Commit

Permalink
Merge tag 'apparmor-pr-2018-09-06' of git://git.kernel.org/pub/scm/li…
Browse files Browse the repository at this point in the history
…nux/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()
  • Loading branch information
torvalds committed Sep 6, 2018
2 parents be65e25 + edf4e7b commit db44bf4
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion security/apparmor/secid.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit db44bf4

Please sign in to comment.