aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-09-06 09:42:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-09-06 09:42:14 -0700
commitdb44bf4b4768a0664d3c9d9000ecb747de31ded8 (patch)
tree31ac2e04d8189af42d0fdc0da5d799903a38504b
parentbe65e2595b4c1fbeceba336d8ee83406726b1d8d (diff)
parentedf4e7b7b9104b58fddfcd073bd7dcc1585d5326 (diff)
downloadlinux-yocto-db44bf4b4768a0664d3c9d9000ecb747de31ded8.tar.gz
linux-yocto-db44bf4b4768a0664d3c9d9000ecb747de31ded8.tar.bz2
linux-yocto-db44bf4b4768a0664d3c9d9000ecb747de31ded8.zip
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()
-rw-r--r--security/apparmor/secid.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/security/apparmor/secid.c b/security/apparmor/secid.c
index f2f22d00db18..4ccec1bcf6f5 100644
--- a/security/apparmor/secid.c
+++ b/security/apparmor/secid.c
@@ -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)