diff options
| author | Linus Torvalds | 2018-09-06 09:42:14 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2018-09-06 09:42:14 -0700 |
| commit | db44bf4b4768a0664d3c9d9000ecb747de31ded8 (patch) | |
| tree | 31ac2e04d8189af42d0fdc0da5d799903a38504b /security | |
| parent | be65e2595b4c1fbeceba336d8ee83406726b1d8d (diff) | |
| parent | edf4e7b7b9104b58fddfcd073bd7dcc1585d5326 (diff) | |
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()
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/secid.c | 1 |
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) |