From: Kuniyuki Iwashima Date: Fri, 13 Dec 2024 11:08:44 +0000 (+0900) Subject: af_unix: Move !sunaddr case in unix_dgram_sendmsg(). X-Git-Tag: v6.14-rc1~162^2~204^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4dd63165b08ba3b72117973d5daea456f36377d;p=thirdparty%2Flinux.git 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 Signed-off-by: Paolo Abeni --- diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 07d6fba99a7c4..111f953849901 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;