From: John Johansen Date: Thu, 23 Oct 2025 06:46:19 +0000 (-0700) Subject: apparmor: fix shadowing of plabel that prevents cache from being updated X-Git-Tag: v7.2-rc1~43^2~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4483efe4f21510b30c24bc97d9fd0e8feab94125;p=thirdparty%2Fkernel%2Flinux.git apparmor: fix shadowing of plabel that prevents cache from being updated Unfortunately the plabel was being shadowed by an unused local var. This didn't affect the mediation check but did cauase the cache to not correctly be updated resulting in extra mediation checks. Fixes: 88fec3526e841 ("apparmor: make sure unix socket labeling is correctly updated.") Signed-off-by: John Johansen --- diff --git a/security/apparmor/af_unix.c b/security/apparmor/af_unix.c index fdb4a9f212c3b..09ce3f6da20ce 100644 --- a/security/apparmor/af_unix.c +++ b/security/apparmor/af_unix.c @@ -758,11 +758,10 @@ int aa_unix_file_perm(const struct cred *subj_cred, struct aa_label *label, unix_fs_perm(op, request, subj_cred, label, is_unix_fs(peer_sk) ? &peer_path : NULL)); } else if (!is_sk_fs) { - struct aa_label *plabel; struct aa_sk_ctx *pctx = aa_sock(peer_sk); rcu_read_lock(); - plabel = aa_get_label_rcu(&pctx->label); + plabel = aa_get_newest_label(pctx->label); rcu_read_unlock(); /* no fs check of aa_unix_peer_perm because conditions above * ensure they will never be done