Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

apparmor: Remove unused variable 'sock' in __file_sock_perm()

When CONFIG_SECURITY_APPARMOR_DEBUG_ASSERTS is disabled, there is a
warning that sock is unused:

security/apparmor/file.c: In function '__file_sock_perm':
security/apparmor/file.c:544:24: warning: unused variable 'sock' [-Wunused-variable]
544 | struct socket *sock = (struct socket *) file->private_data;
| ^~~~

sock was moved into aa_sock_file_perm(), where the same check is
present, so remove sock and the assertion from __file_sock_perm() to fix
the warning.

Fixes: c05e705812d1 ("apparmor: add fine grained af_unix mediation")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202501190757.myuLxLyL-lkp@intel.com/
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: John Johansen <john.johansen@canonical.com>

authored by

Nathan Chancellor and committed by
John Johansen
3e45553a 67e370aa

-3
-3
security/apparmor/file.c
··· 541 541 struct aa_label *flabel, struct file *file, 542 542 u32 request, u32 denied) 543 543 { 544 - struct socket *sock = (struct socket *) file->private_data; 545 544 int error; 546 - 547 - AA_BUG(!sock); 548 545 549 546 /* revalidation due to label out of date. No revocation at this time */ 550 547 if (!denied && aa_label_is_subset(flabel, label))