Commit 001a2508 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Paolo Abeni
Browse files

af_unix: Set error only when needed in unix_dgram_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_dgram_sendmsg().

Then, we need not (re)set 0 to err.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent d460b04b

net/unix/af_unix.c

+19 −13
Original line number Diff line number Diff line
@@ -1978,9 +1978,10 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, 


	wait_for_unix_gc(scm.fp);



	if (msg->msg_flags & MSG_OOB) {

		err = -EOPNOTSUPP;

	if (msg->msg_flags&MSG_OOB)

		goto out;

	}



	if (msg->msg_namelen) {

		err = unix_validate_addr(sunaddr, msg->msg_namelen);
@@ -1995,11 +1996,12 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, 
			goto out;

	} else {

		sunaddr = NULL;

		err = -ENOTCONN;

		other = unix_peer_get(sk);

		if (!other)

		if (!other) {

			err = -ENOTCONN;

			goto out;

		}

	}



	if ((test_bit(SOCK_PASSCRED, &sock->flags) ||

	     test_bit(SOCK_PASSPIDFD, &sock->flags)) &&
@@ -2009,9 +2011,10 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, 
			goto out;

	}



	if (len > READ_ONCE(sk->sk_sndbuf) - 32) {

		err = -EMSGSIZE;

	if (len > READ_ONCE(sk->sk_sndbuf) - 32)

		goto out;

	}



	if (len > SKB_MAX_ALLOC) {

		data_len = min_t(size_t,
@@ -2043,9 +2046,10 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, 


restart:

	if (!other) {

		if (!sunaddr) {

			err = -ECONNRESET;

		if (sunaddr == NULL)

			goto out_free;

		}



		other = unix_find_other(sock_net(sk), sunaddr, msg->msg_namelen,

					sk->sk_type);
@@ -2065,9 +2069,11 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, 
	sk_locked = 0;

	unix_state_lock(other);

restart_locked:



	if (!unix_may_send(sk, other)) {

		err = -EPERM;

	if (!unix_may_send(sk, other))

		goto out_unlock;

	}



	if (unlikely(sock_flag(other, SOCK_DEAD))) {

		/*
@@ -2080,7 +2086,6 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, 
		if (!sk_locked)

			unix_state_lock(sk);



		err = 0;

		if (sk->sk_type == SOCK_SEQPACKET) {

			/* We are here only when racing with unix_release_sock()

			 * is clearing @other. Never change state to TCP_CLOSE
@@ -2108,9 +2113,10 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, 
		goto restart;

	}



	if (other->sk_shutdown & RCV_SHUTDOWN) {

		err = -EPIPE;

	if (other->sk_shutdown & RCV_SHUTDOWN)

		goto out_unlock;

	}



	if (sk->sk_type != SOCK_SEQPACKET) {

		err = security_unix_may_send(sk->sk_socket, other->sk_socket);