af_unix: Add OOB support
Subsystems (3)
PATCH 1/1 af_unix: Add OOB support
From: Rao Shoaib <[email protected]>
syzkaller found that OOB code was holding spinlock while calling a function in which it could sleep.
--- net/unix/af_unix.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
net/unix/af_unix.c +24 -12
@@ -2362,19 +2362,37 @@ static int unix_stream_recv_urg(struct unix_stream_read_state *state)struct sock *sk = sock->sk;struct unix_sock *u =unix_sk (sk);int chunk =1 ; +struct sk_buff *oob_skb; -if (sock_flag (sk,SOCK_URGINLINE ) || !u->oob_skb) +mutex_lock (&u->iolock); +unix_state_lock (sk); + +if (sock_flag (sk,SOCK_URGINLINE ) || !u->oob_skb) { +unix_state_unlock (sk); +mutex_unlock (&u->iolock);return -EINVAL ; + } - chunk = state->recv_actor (u->oob_skb,0 , chunk, state); -if (chunk <0 ) -return -EFAULT ; + oob_skb = u->oob_skb;if (!(state->flags &MSG_PEEK )) { -UNIXCB (u->oob_skb).consumed +=1 ; -kfree_skb (u->oob_skb); u->oob_skb =NULL ; } + +unix_state_unlock (sk); + + chunk = state->recv_actor (oob_skb,0 , chunk, state); + +if (!(state->flags &MSG_PEEK )) { +UNIXCB (oob_skb).consumed +=1 ; +kfree_skb (oob_skb); + } + +mutex_unlock (&u->iolock); + +if (chunk <0 ) +return -EFAULT ; + state->msg->msg_flags |=MSG_OOB ;return 1 ; }
@@ -2434,13 +2452,7 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state,if (unlikely (flags &MSG_OOB )) { err = -EOPNOTSUPP ;#if IS_ENABLED (CONFIG_AF_UNIX_OOB ) -mutex_lock (&u->iolock); -unix_state_lock (sk); - err =unix_stream_recv_urg (state); - -unix_state_unlock (sk); -mutex_unlock (&u->iolock);#endif goto out; }
Signature · 1 line
2.27.0
Jakub Kicinski
maintainerQuoted 8 lines · On Tue, 10 Aug 2021 11:31:22 -0700 Rao Shoaib wrote:
From: Rao Shoaib <[email protected]>
syzkaller found that OOB code was holding spinlock while calling a function in which it could sleep.
Reported-by [email protected]Fixes 314001f0bf92 ("af_unix: Add OOB support")
No new lines between tags please.
Quoted 1 line
Signed-off-by Rao Shoaib <[email protected]>
Would you mind resending with a better subject? Something like "af_unix: fix possible sleep under spinlock in oob handling"?
Sure will do.
Shoaib
Quoted 14 lines · Jakub Kicinski
Quoted 8 lines · On Tue, 10 Aug 2021 11:31:22 -0700 Rao Shoaib wrote:
From: Rao Shoaib <[email protected]>
syzkaller found that OOB code was holding spinlock while calling a function in which it could sleep.
Reported-by [email protected]Fixes 314001f0bf92 ("af_unix: Add OOB support")No new lines between tags please.
Quoted 1 line
Signed-off-by Rao Shoaib <[email protected]>Would you mind resending with a better subject? Something like "
af_unix: fix possible sleep under spinlock in oob handling"?