FAILED: patch "[PATCH] apparmor: Fix regression in profile conflict logic" failed to apply to 4.14-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
1a3881d305592d947ed47887306919d50112394dMon Sep 17 00:00:00 2001
From: Matthew Garrett <[email protected]>
Date: Thu, 11 Jan 2018 13:07:54 -0800
Subject: [PATCH] apparmor: Fix regression in profile conflict logic
The intended behaviour in apparmor profile matching is to flag a conflict if two profiles match equally well. However, right now a conflict is generated if another profile has the same match length even if that profile doesn't actually match. Fix the logic so we only generate a conflict if the profiles match.
security/apparmor/domain.c +5 -4
@@ -330,10 +330,7 @@ static struct aa_profile *__attach_match(const char *name,continue ;if (profile->xmatch) { -if (profile->xmatch_len == len) { - conflict = true; -continue ; - }else if (profile->xmatch_len > len) { +if (profile->xmatch_len >= len) {unsigned int state;u32 perm;
@@ -342,6 +339,10 @@ static struct aa_profile *__attach_match(const char *name, perm =dfa_user_allow (profile->xmatch, state);/* any accepting state means a valid match. */ if (perm &MAY_EXEC ) { +if (profile->xmatch_len == len) { + conflict = true; +continue ; + } candidate = profile; len = profile->xmatch_len; conflict = false;