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>

diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index f113eedbc208fe5b7502942ec3c2a36853346984..5c984792cbf093ae96aa81758f2858ac23a48e51 100644 (file)
--- 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;