diff options
| author | John Johansen <john.johansen@canonical.com> | 2016-06-15 09:00:55 +0200 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2016-07-12 17:43:10 +0200 |
| commit | 5f20fdfed16bc599a325a145bf0123a8e1c9beea (patch) | |
| tree | fa700aadf27b4e0f454918b6dd06c7a40133173c /security/apparmor/policy_unpack.c | |
| parent | apparmor: don't check for vmalloc_addr if kvzalloc() failed (diff) | |
| download | linux-5f20fdfed16bc599a325a145bf0123a8e1c9beea.tar.xz linux-5f20fdfed16bc599a325a145bf0123a8e1c9beea.zip | |
apparmor: fix oops in profile_unpack() when policy_db is not present
BugLink: http://bugs.launchpad.net/bugs/1592547
If unpack_dfa() returns NULL due to the dfa not being present,
profile_unpack() is not checking if the dfa is not present (NULL).
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/policy_unpack.c')
| -rw-r--r-- | security/apparmor/policy_unpack.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index 951ae4633979..b9b1c66a32a5 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -583,6 +583,9 @@ static struct aa_profile *unpack_profile(struct aa_ext *e) error = PTR_ERR(profile->policy.dfa); profile->policy.dfa = NULL; goto fail; + } else if (!profile->policy.dfa) { + error = -EPROTO; + goto fail; } if (!unpack_u32(e, &profile->policy.start[0], "start")) /* default start state */ |