averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-12-22 12:17:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

af_unix: Split restart label in unix_dgram_sendmsg().

Browse Source 
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: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Kuniyuki Iwashima
2024-12-13 20:08:46 +09:00
committed by Paolo Abeni
parent 3c05329a2a
commit a700b43358
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/unix/af_unix.c
View File

@@ -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 @@ restart:
goto out_free;
}
restart:
sk_locked = 0;
unix_state_lock(other);
restart_locked:
@@ -2106,7 +2107,8 @@ restart_locked:
other = NULL;
if (err)
goto out_free;
goto restart;
goto lookup;
}
if (other->sk_shutdown & RCV_SHUTDOWN) {