diff options
| author | Nathan Chancellor <nathan@kernel.org> | 2025-01-20 06:21:14 -0700 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2025-02-10 11:18:45 -0800 |
| commit | 3e45553acb14692519db853e4b5be35b45e46ad0 (patch) | |
| tree | 6652de214a3d0ddcc1d9f0bd4791c8b1a897ae47 | |
| parent | 67e370aa7f968f6a4f3573ed61a77b36d1b26475 (diff) | |
| download | linux-apparmor-apparmor-next.tar.gz | |
apparmor: Remove unused variable 'sock' in __file_sock_perm()apparmor-next
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>
| -rw-r--r-- | security/apparmor/file.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/security/apparmor/file.c b/security/apparmor/file.c index f113eedbc208fe..5c984792cbf093 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; |