apparmor: fix 'Do simple duplicate message elimination'

[ Upstream commit 9b897132424fe76bf6c61f22f9cf12af7f1d1e6a ]

Multiple profiles shared 'ent->caps', so some logs missed.

Fixes: 0ed3b28ab8bf ("AppArmor: mediation of non file objects")
Signed-off-by: chao liu <liuzgyid@outlook.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/security/apparmor/capability.c b/security/apparmor/capability.c
index 9934df16c8431de3e42f38ccbaee0a40713dfa8a..bf7df60868308d0581fae211946f5bd2679149f1 100644 (file)
--- a/security/apparmor/capability.c
+++ b/security/apparmor/capability.c
@@ -96,6 +96,8 @@ static int audit_caps(struct apparmor_audit_data *ad, struct aa_profile *profile
                return error;
        } else {
                aa_put_profile(ent->profile);
+               if (profile != ent->profile)
+                       cap_clear(ent->caps);
                ent->profile = aa_get_profile(profile);
                cap_raise(ent->caps, cap);
        }