lkml.org 
[lkml]   [2022]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 032/244] apparmor: fix setting unconfined mode on a loaded profile
    Date
    From: John Johansen <john.johansen@canonical.com>

    commit 3bbb7b2e9bbcd22e539e23034da753898fe3b4dc upstream.

    When loading a profile that is set to unconfined mode, that label
    flag is not set when it should be. Ensure it is set so that when
    used in a label the unconfined check will be applied correctly.

    Fixes: 038165070aa5 ("apparmor: allow setting any profile into the unconfined state")
    Signed-off-by: John Johansen <john.johansen@canonical.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    security/apparmor/policy_unpack.c | 12 +++++++-----
    1 file changed, 7 insertions(+), 5 deletions(-)

    --- a/security/apparmor/policy_unpack.c
    +++ b/security/apparmor/policy_unpack.c
    @@ -746,16 +746,18 @@ static struct aa_profile *unpack_profile
    profile->label.flags |= FLAG_HAT;
    if (!unpack_u32(e, &tmp, NULL))
    goto fail;
    - if (tmp == PACKED_MODE_COMPLAIN || (e->version & FORCE_COMPLAIN_FLAG))
    + if (tmp == PACKED_MODE_COMPLAIN || (e->version & FORCE_COMPLAIN_FLAG)) {
    profile->mode = APPARMOR_COMPLAIN;
    - else if (tmp == PACKED_MODE_ENFORCE)
    + } else if (tmp == PACKED_MODE_ENFORCE) {
    profile->mode = APPARMOR_ENFORCE;
    - else if (tmp == PACKED_MODE_KILL)
    + } else if (tmp == PACKED_MODE_KILL) {
    profile->mode = APPARMOR_KILL;
    - else if (tmp == PACKED_MODE_UNCONFINED)
    + } else if (tmp == PACKED_MODE_UNCONFINED) {
    profile->mode = APPARMOR_UNCONFINED;
    - else
    + profile->label.flags |= FLAG_UNCONFINED;
    + } else {
    goto fail;
    + }
    if (!unpack_u32(e, &tmp, NULL))
    goto fail;
    if (tmp)

    \
     
     \ /
      Last update: 2022-08-23 11:43    [W:3.266 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site