From: John Johansen Date: Wed, 15 Jun 2016 07:00:55 +0000 (+0300) Subject: apparmor: fix oops in profile_unpack() when policy_db is not present X-Git-Tag: v3.12.70~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d035c957c895e43b78939f092c052ac6921b360d;p=thirdparty%2Fkernel%2Fstable.git apparmor: fix oops in profile_unpack() when policy_db is not present commit 5f20fdfed16bc599a325a145bf0123a8e1c9beea upstream. 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 Signed-off-by: Jiri Slaby --- diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index c841b1268a849..dac2121bc8739 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 */