Re: [PATCH] apparmor: remove unused variable
From: sergeh@kernel.org
Date: 2025-01-22 20:03:39
Also in:
lkml
On Wed, Jan 22, 2025 at 07:55:35AM +0100, Arnd Bergmann wrote:
From: Arnd Bergmann <arnd@arndb.de> The local 'sock' variable has become unused after a change to the aa_sock_file_perm() calling conventions: security/apparmor/file.c: In function '__file_sock_perm': security/apparmor/file.c:544:24: error: unused variable 'sock' [-Werror=unused-variable] 544 | struct socket *sock = (struct socket *) file->private_data; Remove it here.
That's interesting. The aa_sock_file_perm() further in will still trip the AA_BUG(!sock) if there's some shenanigans going on so no big loss in dropping the AA_BUG.
Fixes: c05e705812d1 ("apparmor: add fine grained af_unix mediation")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>Acked-by: Serge Hallyn <serge@hallyn.com>
quoted hunk ↗ jump to hunk
--- security/apparmor/file.c | 3 --- 1 file changed, 3 deletions(-)diff --git a/security/apparmor/file.c b/security/apparmor/file.c index 85f89814af1e..e3a858649942 100644 --- a/security/apparmor/file.c +++ b/security/apparmor/file.c@@ -541,11 +541,8 @@ static int __file_sock_perm(const char *op, const struct cred *subj_cred, struct aa_label *flabel, struct file *file, u32 request, u32 denied) { - struct socket *sock = (struct socket *) file->private_data; int error; - AA_BUG(!sock); - /* revalidation due to label out of date. No revocation at this time */ if (!denied && aa_label_is_subset(flabel, label)) return 0;-- 2.39.5