samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

af_unix: Define locking order for U_LOCK_SECOND in unix_state_double_lock().

Browse Source 
[ Upstream commit ed99822817cb728eee8786c1c921c69c6be206fe ]

unix_dgram_connect() and unix_dgram_{send,recv}msg() lock the socket
and peer in ascending order of the socket address.

Let's define the order as unix_state_lock_cmp_fn() instead of using
unix_state_lock_nested().

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Kent Overstreet <kent.overstreet@linux.dev>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Stable-dep-of: 32ca245464e1 ("af_unix: Don't leave consecutive consumed OOB skbs.")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Kuniyuki Iwashima
2024-06-20 13:56:14 -07:00
committed by Greg Kroah-Hartman
parent b7904e2fcc
commit fd3af69c14
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/unix/af_unix.c
View File

@@ -133,6 +133,18 @@ static int unix_table_lock_cmp_fn(const struct lockdep_map *a,
{ {
return cmp_ptr(a, b); return cmp_ptr(a, b);
} }
static int unix_state_lock_cmp_fn(const struct lockdep_map *_a,
const struct lockdep_map *_b)
{
const struct unix_sock *a, *b;
a = container_of(_a, struct unix_sock, lock.dep_map);
b = container_of(_b, struct unix_sock, lock.dep_map);
/* unix_state_double_lock(): ascending address order. */
return cmp_ptr(a, b);
}
#endif #endif
static unsigned int unix_unbound_hash(struct sock *sk) static unsigned int unix_unbound_hash(struct sock *sk)
@@ -992,6 +1004,7 @@ static struct sock *unix_create1(struct net *net, struct socket *sock, int kern,
u->path.dentry = NULL; u->path.dentry = NULL;
u->path.mnt = NULL; u->path.mnt = NULL;
spin_lock_init(&u->lock); spin_lock_init(&u->lock);
lock_set_cmp_fn(&u->lock, unix_state_lock_cmp_fn, NULL);
mutex_init(&u->iolock); /* single task reading lock */ mutex_init(&u->iolock); /* single task reading lock */
mutex_init(&u->bindlock); /* single task binding lock */ mutex_init(&u->bindlock); /* single task binding lock */
init_waitqueue_head(&u->peer_wait); init_waitqueue_head(&u->peer_wait);
@@ -1340,11 +1353,12 @@ static void unix_state_double_lock(struct sock *sk1, struct sock *sk2)
unix_state_lock(sk1); unix_state_lock(sk1);
return; return;
} }
if (sk1 > sk2) if (sk1 > sk2)
swap(sk1, sk2); swap(sk1, sk2);
unix_state_lock(sk1); unix_state_lock(sk1);
unix_state_lock_nested(sk2, U_LOCK_SECOND); unix_state_lock(sk2);
} }
static void unix_state_double_unlock(struct sock *sk1, struct sock *sk2) static void unix_state_double_unlock(struct sock *sk1, struct sock *sk2)