lkml.org 
[lkml]   [2017]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 217/235] apparmor: fix oops in profile_unpack() when policy_db is not present
    Date
    From: John Johansen <john.johansen@canonical.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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 <john.johansen@canonical.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    security/apparmor/policy_unpack.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
    index c841b1268a84..dac2121bc873 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 */
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-01-27 12:19    [W:2.157 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site