diff options
| author |   Wei Wang <weiwan@google.com> | 2017-06-23 15:25:37 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-06-25 11:46:56 -0400 |
| commit | 85cb73ff9b74785a7fc752875d7f0fe17ca3ea7c (patch) | |
| tree | 00339cc580169297c2ae02f372d7f90cc0f7e652 /net/ipv6/udp.c | |
| parent | bnx2x: Don't log mc removal needlessly (diff) | |
| download | linux-dev-85cb73ff9b74785a7fc752875d7f0fe17ca3ea7c.tar.xz linux-dev-85cb73ff9b74785a7fc752875d7f0fe17ca3ea7c.zip | |
net: ipv6: reset daddr and dport in sk if connect() fails
In __ip6_datagram_connect(), reset sk->sk_v6_daddr and inet->dport if
error occurs.
In udp_v6_early_demux(), check for sk_state to make sure it is in
TCP_ESTABLISHED state.
Together, it makes sure unconnected UDP socket won't be considered as a
valid candidate for early demux.
v3: add TCP_ESTABLISHED state check in udp_v6_early_demux()
v2: fix compilation error
Fixes: 5425077d73e0 ("net: ipv6: Add early demux handler for UDP unicast")
Signed-off-by: Wei Wang <weiwan@google.com>
Acked-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 06ec39b79609..75703fda23e7 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -879,7 +879,8 @@ static struct sock *__udp6_lib_demux_lookup(struct net *net, struct sock *sk; udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) { - if (INET6_MATCH(sk, net, rmt_addr, loc_addr, ports, dif)) + if (sk->sk_state == TCP_ESTABLISHED && + INET6_MATCH(sk, net, rmt_addr, loc_addr, ports, dif)) return sk; /* Only check first socket in chain */ break; |