diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-02-04 14:09:33 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-02-04 14:09:33 -0800 |
| commit | c8bdef1560d976340e421d5e188f94789e4cfa28 (patch) | |
| tree | cee684e80305ca00c97fcfcf8527c23b8f1df7a2 /net/unix/diag.c | |
| parent | 349bd87f6091ac68b8eab368ce30bcaf6d45c50e (diff) | |
| parent | 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 (diff) | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'net/unix/diag.c')
| -rw-r--r-- | net/unix/diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/diag.c b/net/unix/diag.c index bec09a3a1d44..be19827eca36 100644 --- a/net/unix/diag.c +++ b/net/unix/diag.c @@ -84,7 +84,7 @@ static int sk_diag_dump_icons(struct sock *sk, struct sk_buff *nlskb) * queue lock. With the other's queue locked it's * OK to lock the state. */ - unix_state_lock_nested(req); + unix_state_lock_nested(req, U_LOCK_DIAG); peer = unix_sk(req)->peer; buf[i++] = (peer ? sock_i_ino(peer) : 0); unix_state_unlock(req); |