diff options
| author | Kuniyuki Iwashima <[email protected]> | 2024-12-13 11:08:44 +0000 |
|---|---|---|
| committer | Paolo Abeni <[email protected]> | 2024-12-17 11:08:28 +0000 |
| commit | f4dd63165b08ba3b72117973d5daea456f36377d (patch) | |
| tree | 1c759fa81e0a9ed12a17725557029383faa2196c /net/unix/af_unix.c | |
| parent | af_unix: Set error only when needed in unix_dgram_sendmsg(). (diff) | |
| download | kernel-f4dd63165b08ba3b72117973d5daea456f36377d.tar.gz kernel-f4dd63165b08ba3b72117973d5daea456f36377d.zip | |
af_unix: Move !sunaddr case in unix_dgram_sendmsg().
When other is NULL in unix_dgram_sendmsg(), we check if sunaddr
is NULL before looking up a receiver socket.
There are three paths going through the check, but it's always
false for 2 out of the 3 paths: the first socket lookup and the
second 'goto restart'.
The condition can be true for the first 'goto restart' only when
SOCK_DEAD is flagged for the socket found with msg->msg_name.
Let's move the check to the single appropriate path.
Signed-off-by: Kuniyuki Iwashima <[email protected]>
Signed-off-by: Paolo Abeni <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 07d6fba99a7c..111f95384990 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2046,11 +2046,6 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, restart: if (!other) { - if (!sunaddr) { - err = -ECONNRESET; - goto out_free; - } - other = unix_find_other(sock_net(sk), sunaddr, msg->msg_namelen, sk->sk_type); if (IS_ERR(other)) { @@ -2105,6 +2100,9 @@ restart_locked: err = -ECONNREFUSED; } else { unix_state_unlock(sk); + + if (!sunaddr) + err = -ECONNRESET; } other = NULL; |