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

af_unix: Split restart label in unix_dgram_sendmsg(). 



There are two paths jumping to the restart label in unix_dgram_sendmsg().

One requires another lookup and sk_filter(), but the other doesn't.

Let's split the label to make each flow more straightforward.

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

net/unix/af_unix.c

+4 −2
Original line number Diff line number Diff line
@@ -2042,8 +2042,8 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, 


	timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);



restart:

	if (!other) {

lookup:

		other = unix_find_other(sock_net(sk), msg->msg_name,

					msg->msg_namelen, sk->sk_type);

		if (IS_ERR(other)) {
@@ -2059,6 +2059,7 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, 
		goto out_free;

	}



restart:

	sk_locked = 0;

	unix_state_lock(other);

restart_locked:
@@ -2106,7 +2107,8 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, 
		other = NULL;

		if (err)

			goto out_free;

		goto restart;



		goto lookup;

	}



	if (other->sk_shutdown & RCV_SHUTDOWN) {