admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

af_unix: Set error only when needed in unix_stream_connect().

Browse Source 
We will introduce skb drop reason for AF_UNIX, then we need to
set an errno and a drop reason for each path.

Let's set an error only when it's needed in unix_stream_connect().

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Kuniyuki Iwashima
2024-12-13 20:08:39 +09:00
committed by Paolo Abeni
parent a14a429069
commit 34c899af6c
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
net/unix/af_unix.c
View File

@@ -1575,12 +1575,12 @@ static int unix_stream_connect(struct socket *sock, struct sockaddr *uaddr,
goto out;
}
err = -ENOMEM;
/* Allocate skb for sending to listening sock */
skb = sock_wmalloc(newsk, 1, 0, GFP_KERNEL);
if (skb == NULL)
if (!skb) {
err = -ENOMEM;
goto out;
}
restart:
/* Find listening sock. */
@@ -1600,16 +1600,17 @@ restart:
goto restart;
}
err = -ECONNREFUSED;
if (other->sk_state != TCP_LISTEN)
goto out_unlock;
if (other->sk_shutdown & RCV_SHUTDOWN)
if (other->sk_state != TCP_LISTEN ||
other->sk_shutdown & RCV_SHUTDOWN) {
err = -ECONNREFUSED;
goto out_unlock;
}
if (unix_recvq_full_lockless(other)) {
err = -EAGAIN;
if (!timeo)
if (!timeo) {
err = -EAGAIN;
goto out_unlock;
}
timeo = unix_wait_for_peer(other, timeo);