From fe44df2f13a7db48b9aabadd3862851e38a25dd7 Mon Sep 17 00:00:00 2001 From: chao liu Date: Wed, 19 Feb 2025 09:44:24 +0800 Subject: [PATCH] apparmor: fix 'Do simple duplicate message elimination' mainline inclusion from mainline-v6.13-rc1 commit 9b897132424fe76bf6c61f22f9cf12af7f1d1e6a category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBEWQE Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9b897132424fe76bf6c61f22f9cf12af7f1d1e6a -------------------------------- Multiple profiles shared 'ent->caps', so some logs missed. Fixes: 0ed3b28ab8bf ("AppArmor: mediation of non file objects") Signed-off-by: chao liu Signed-off-by: John Johansen Signed-off-by: Gu Bowen --- security/apparmor/capability.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/security/apparmor/capability.c b/security/apparmor/capability.c index deccea8654ad..1b13fd89d5a9 100644 --- a/security/apparmor/capability.c +++ b/security/apparmor/capability.c @@ -94,6 +94,8 @@ static int audit_caps(struct common_audit_data *sa, 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); } -- Gitee