diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2024-12-13 14:08:41 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-12-17 14:08:27 +0300 |
| commit | 6c444255b193b5b9c5a18c3784d960e10e1833a2 (patch) | |
| tree | 9ab49930508d13533ebfe8aa6bc6b72c1341a0db /net/unix/af_unix.c | |
| parent | e26ee0a736bd949ce6fa51829fd0a2f6381391de (diff) | |
| download | linux-6c444255b193b5b9c5a18c3784d960e10e1833a2.tar.xz | |
af_unix: Set error only when needed in unix_stream_sendmsg().
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_sendmsg().
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 21e17e739f88..660d8b8130ca 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2254,8 +2254,8 @@ static int unix_stream_sendmsg(struct socket *sock, struct msghdr *msg, wait_for_unix_gc(scm.fp); - err = -EOPNOTSUPP; if (msg->msg_flags & MSG_OOB) { + err = -EOPNOTSUPP; #if IS_ENABLED(CONFIG_AF_UNIX_OOB) if (len) len--; @@ -2268,10 +2268,11 @@ static int unix_stream_sendmsg(struct socket *sock, struct msghdr *msg, err = READ_ONCE(sk->sk_state) == TCP_ESTABLISHED ? -EISCONN : -EOPNOTSUPP; goto out_err; } else { - err = -ENOTCONN; other = unix_peer(sk); - if (!other) + if (!other) { + err = -ENOTCONN; goto out_err; + } } if (READ_ONCE(sk->sk_shutdown) & SEND_SHUTDOWN) |