diff options
author | Jakub Kicinski <kuba@kernel.org> | 2020-11-01 03:28:17 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-01 03:34:19 +0300 |
commit | 859191b234f86b5f36cbe384baca1067a2221eb7 (patch) | |
tree | 07633504033079aca158db2c4fb988ca757629b9 /net/netfilter/nf_synproxy_core.c | |
parent | 20149e9eb68c003eaa09e7c9a49023df40779552 (diff) | |
parent | 7d10e62c2ff8e084c136c94d32d9a94de4d31248 (diff) | |
download | linux-859191b234f86b5f36cbe384baca1067a2221eb7.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Incorrect netlink report logic in flowtable and genID.
2) Add a selftest to check that wireguard passes the right sk
to ip_route_me_harder, from Jason A. Donenfeld.
3) Pass the actual sk to ip_route_me_harder(), also from Jason.
4) Missing expression validation of updates via nft --check.
5) Update byte and packet counters regardless of whether they
match, from Stefano Brivio.
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/netfilter/nf_synproxy_core.c')
-rw-r--r-- | net/netfilter/nf_synproxy_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_synproxy_core.c b/net/netfilter/nf_synproxy_core.c index 9cca35d22927..d7d34a62d3bf 100644 --- a/net/netfilter/nf_synproxy_core.c +++ b/net/netfilter/nf_synproxy_core.c @@ -446,7 +446,7 @@ synproxy_send_tcp(struct net *net, skb_dst_set_noref(nskb, skb_dst(skb)); nskb->protocol = htons(ETH_P_IP); - if (ip_route_me_harder(net, nskb, RTN_UNSPEC)) + if (ip_route_me_harder(net, nskb->sk, nskb, RTN_UNSPEC)) goto free_nskb; if (nfct) { |