diff options
| author | Maxime Ripard <mripard@kernel.org> | 2024-02-26 17:23:00 +0300 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2024-02-26 17:23:00 +0300 |
| commit | 2f910859724b53f1cd3579246e3d9bebb16d78b8 (patch) | |
| tree | 75cd2329b7e737865bf28ea734a2e0649c02a5bf /net/unix/diag.c | |
| parent | 86bf8cfda6d2a6720fa2e6e676c98f0882c9d3d7 (diff) | |
| parent | 72fa02fdf83306c52bc1eede28359e3fa32a151a (diff) | |
| download | linux-2f910859724b53f1cd3579246e3d9bebb16d78b8.tar.xz | |
Merge drm/drm-fixes into drm-misc-fixes
Sima needs a more recent release to apply a patch.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
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); |