diff options
| author | John Johansen <john.johansen@canonical.com> | 2022-03-26 01:58:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-08-25 11:15:36 +0200 |
| commit | 7af35951404b134731926cf80a218db7b1795ae9 (patch) | |
| tree | 36f27a46777df8fb87c160a06e68de4cebe3c60a /security | |
| parent | 5fc2dbf79d14bc2da5dfc6ac66e5d0ca31057652 (diff) | |
| download | linux-stable-7af35951404b134731926cf80a218db7b1795ae9.tar.gz linux-stable-7af35951404b134731926cf80a218db7b1795ae9.tar.bz2 linux-stable-7af35951404b134731926cf80a218db7b1795ae9.zip | |
apparmor: fix overlapping attachment computation
commit 2504db207146543736e877241f3b3de005cbe056 upstream.
When finding the profile via patterned attachments, the longest left
match is being set to the static compile time value and not using the
runtime computed value.
Fix this by setting the candidate value to the greater of the
precomputed value or runtime computed value.
Fixes: 21f606610502 ("apparmor: improve overlapping domain attachment resolution")
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/domain.c | 2 | ||||
| -rw-r--r-- | security/apparmor/include/policy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index 13b33490e079..dad704825294 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c @@ -464,7 +464,7 @@ restart: * xattrs, or a longer match */ candidate = profile; - candidate_len = profile->xmatch_len; + candidate_len = max(count, profile->xmatch_len); candidate_xattrs = ret; conflict = false; } diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h index 28c098fb6208..92fa4f610212 100644 --- a/security/apparmor/include/policy.h +++ b/security/apparmor/include/policy.h @@ -139,7 +139,7 @@ struct aa_profile { const char *attach; struct aa_dfa *xmatch; - int xmatch_len; + unsigned int xmatch_len; enum audit_mode audit; long mode; u32 path_flags; |