Commit 6c444255 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Paolo Abeni
Browse files

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: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent e26ee0a7

net/unix/af_unix.c

+4 −3
Original line number Diff line number Diff line
@@ -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,11 +2268,12 @@ 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)

		goto pipe_err;