diff options
author | Ingo Molnar <mingo@kernel.org> | 2021-03-29 15:56:48 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2021-03-29 15:56:48 +0200 |
commit | feecb81732d8f271440d907beb082425e109f877 (patch) | |
tree | af55ca33d43cf3b3c2b82e9860df7d01be061a0f /net/mptcp/subflow.c | |
parent | MAINTAINERS: Add myself as futex reviewer (diff) | |
parent | Linux 5.12-rc5 (diff) | |
download | wireguard-linux-feecb81732d8f271440d907beb082425e109f877.tar.xz wireguard-linux-feecb81732d8f271440d907beb082425e109f877.zip |
Merge tag 'v5.12-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/mptcp/subflow.c')
-rw-r--r-- | net/mptcp/subflow.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 3d47d670e665..d17d39ccdf34 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -477,6 +477,11 @@ static int subflow_v6_conn_request(struct sock *sk, struct sk_buff *skb) if (!ipv6_unicast_destination(skb)) goto drop; + if (ipv6_addr_v4mapped(&ipv6_hdr(skb)->saddr)) { + __IP6_INC_STATS(sock_net(sk), NULL, IPSTATS_MIB_INHDRERRORS); + return 0; + } + return tcp_conn_request(&mptcp_subflow_request_sock_ops, &subflow_request_sock_ipv6_ops, sk, skb); |