diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2024-12-13 14:08:46 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-12-17 14:08:28 +0300 |
| commit | a700b43358ccc3c5ae857eeea37ff50ce0529b1c (patch) | |
| tree | 2fe0a05a864ff6915a919fb671d80c69c2cc15ea /net/unix/af_unix.c | |
| parent | 3c05329a2abe312ed85a60a325b930063f61e817 (diff) | |
| download | linux-a700b43358ccc3c5ae857eeea37ff50ce0529b1c.tar.xz | |
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: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index ae74fdcf5dcd..513d0fd12e6a 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -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) { |