diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2025-03-26 15:01:48 +1100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-03-26 09:31:18 -0700 |
| commit | 705094f6556d88540e1076e432cbca6b596421dd (patch) | |
| tree | 359652a4e1067339cbc0980e549a4cbeec721dba /net/unix/af_unix.h | |
| parent | a19f40d919ca6d16bbc03d858690f60f1a9bf3ed (diff) | |
| download | linux-705094f6556d88540e1076e432cbca6b596421dd.tar.gz linux-705094f6556d88540e1076e432cbca6b596421dd.tar.bz2 linux-705094f6556d88540e1076e432cbca6b596421dd.zip | |
unix: fix up for "apparmor: add fine grained af_unix mediation"
After merging the apparmor tree, today's linux-next build (x86_64
allmodconfig) failed like this:
security/apparmor/af_unix.c: In function 'unix_state_double_lock':
security/apparmor/af_unix.c:627:17: error: implicit declaration of function 'unix_state_lock'; did you mean 'unix_state_double_lock'? [-Wimplicit-function-declaration]
627 | unix_state_lock(sk1);
| ^~~~~~~~~~~~~~~
| unix_state_double_lock
security/apparmor/af_unix.c: In function 'unix_state_double_unlock':
security/apparmor/af_unix.c:642:17: error: implicit declaration of function 'unix_state_unlock'; did you mean 'unix_state_double_lock'? [-Wimplicit-function-declaration]
642 | unix_state_unlock(sk1);
| ^~~~~~~~~~~~~~~~~
| unix_state_double_lock
Caused by commit
c05e705812d1 ("apparmor: add fine grained af_unix mediation")
interacting with commit
84960bf24031 ("af_unix: Move internal definitions to net/unix/.")
from the net-next tree.
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://patch.msgid.link/20250326150148.72d9138d@canb.auug.org.au
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/unix/af_unix.h')
| -rw-r--r-- | net/unix/af_unix.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/unix/af_unix.h b/net/unix/af_unix.h index ed4aedc42813..59db179df9bb 100644 --- a/net/unix/af_unix.h +++ b/net/unix/af_unix.h @@ -8,9 +8,6 @@ #define UNIX_HASH_SIZE (256 * 2) #define UNIX_HASH_BITS 8 -#define unix_state_lock(s) spin_lock(&unix_sk(s)->lock) -#define unix_state_unlock(s) spin_unlock(&unix_sk(s)->lock) - struct sock *unix_peer_get(struct sock *sk); struct unix_skb_parms { |