Commit 705094f6 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Jakub Kicinski
Browse files

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

  c05e7058 ("apparmor: add fine grained af_unix mediation")

interacting with commit

  84960bf2 ("af_unix: Move internal definitions to net/unix/.")

from the net-next tree.

Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Link: https://patch.msgid.link/20250326150148.72d9138d@canb.auug.org.au


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a19f40d9

include/net/af_unix.h

+3 −0
Original line number Diff line number Diff line
@@ -55,4 +55,7 @@ struct unix_sock { 
#define unix_sk(ptr) container_of_const(ptr, struct unix_sock, sk)

#define unix_peer(sk) (unix_sk(sk)->peer)



#define unix_state_lock(s)	spin_lock(&unix_sk(s)->lock)

#define unix_state_unlock(s)	spin_unlock(&unix_sk(s)->lock)



#endif

net/unix/af_unix.h

+0 −3
Original line number Diff line number Diff line
@@ -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 {