mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

af_unix: Set TCP_ESTABLISHED for datagram sockets too

Browse source 
Currently only unix stream socket sets TCP_ESTABLISHED,
datagram socket can set this too when they connect to its
peer socket. At least __ip4_datagram_connect() does the same.

This will be used to determine whether an AF_UNIX datagram
socket can be redirected to in sockmap.

Signed-off-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210704190252.11866-5-xiyou.wangcong@gmail.com
This commit is contained in:
Cong Wang 2021-07-04 12:02:45 -07:00 committed by Alexei Starovoitov
parent 29df44fa52
commit 83301b5367
1 changed files with 8 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
net/unix/af_unix.c
View file

@ -494,6 +494,7 @@ static void unix_dgram_disconnected(struct sock *sk, struct sock *other)
sk_error_report(other); sk_error_report(other);
} }
} }
sk->sk_state = other->sk_state = TCP_CLOSE;
} }
static void unix_sock_destructor(struct sock *sk) static void unix_sock_destructor(struct sock *sk)
@ -1202,6 +1203,9 @@ static int unix_dgram_connect(struct socket *sock, struct sockaddr *addr,
unix_peer(sk) = other; unix_peer(sk) = other;
unix_state_double_unlock(sk, other); unix_state_double_unlock(sk, other);
} }
if (unix_peer(sk))
sk->sk_state = other->sk_state = TCP_ESTABLISHED;
return 0; return 0;
out_unlock: out_unlock:
@ -1434,12 +1438,10 @@ static int unix_socketpair(struct socket *socka, struct socket *sockb)
init_peercred(ska); init_peercred(ska);
init_peercred(skb); init_peercred(skb);
if (ska->sk_type != SOCK_DGRAM) {
ska->sk_state = TCP_ESTABLISHED; ska->sk_state = TCP_ESTABLISHED;
skb->sk_state = TCP_ESTABLISHED; skb->sk_state = TCP_ESTABLISHED;
socka->state = SS_CONNECTED; socka->state = SS_CONNECTED;
sockb->state = SS_CONNECTED; sockb->state = SS_CONNECTED;
}
return 0; return 0;
} }