Skip to content

Commit 705094f

Browse files
sfrothwellkuba-moo
authored andcommitted
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 c05e705 ("apparmor: add fine grained af_unix mediation") interacting with commit 84960bf ("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>
1 parent a19f40d commit 705094f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/net/af_unix.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,7 @@ struct unix_sock {
5555
#define unix_sk(ptr) container_of_const(ptr, struct unix_sock, sk)
5656
#define unix_peer(sk) (unix_sk(sk)->peer)
5757

58+
#define unix_state_lock(s) spin_lock(&unix_sk(s)->lock)
59+
#define unix_state_unlock(s) spin_unlock(&unix_sk(s)->lock)
60+
5861
#endif

net/unix/af_unix.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
#define UNIX_HASH_SIZE (256 * 2)
99
#define UNIX_HASH_BITS 8
1010

11-
#define unix_state_lock(s) spin_lock(&unix_sk(s)->lock)
12-
#define unix_state_unlock(s) spin_unlock(&unix_sk(s)->lock)
13-
1411
struct sock *unix_peer_get(struct sock *sk);
1512

1613
struct unix_skb_parms {

0 commit comments

Comments
 (0)