Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xtables-addons: patch for 4.14 route_me_harder fix

Browse source 
backport xtables-addons: 0ab324790015a6396be5678b6dffeeaa1cd28299

build: adjust for changed signature of ip_route_me_harder

(Cf. commit 46d6c5ae953cc0be38efd0e469284df7c4328cf8 in Linux.)

Original author: Jan Engelhardt <jengelh@inai.de>

Backported by: Aaron Goodman <aaronjg@stanford.edu>
Signed-off-by: Aaron Goodman <aaronjg@stanford.edu>
This commit is contained in:
Aaron Goodman 2020-11-25 19:31:31 -05:00
parent b00feac4b5
commit 12b0f8c1ab
1 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
net/xtables-addons/patches/202-fix-route-me-harder.patch Normal file
View file

@ -0,0 +1,42 @@
--- a/extensions/xt_DELUDE.c
+++ b/extensions/xt_DELUDE.c
@@ -122,7 +122,7 @@ static void delude_send_reset(struct net
/* ip_route_me_harder expects skb->dst to be set */
skb_dst_set(nskb, dst_clone(skb_dst(oldskb)));
- if (ip_route_me_harder(net, nskb, addr_type))
+ if (ip_route_me_harder(net, nskb->sk, nskb, addr_type))
goto free_nskb;
else
niph = ip_hdr(nskb);
--- a/extensions/xt_ECHO.c
+++ b/extensions/xt_ECHO.c
@@ -196,7 +196,7 @@ echo_tg4(struct sk_buff *oldskb, const s
/* ip_route_me_harder expects the skb's dst to be set */
skb_dst_set(newskb, dst_clone(skb_dst(oldskb)));
- if (ip_route_me_harder(par_net(par), newskb, RTN_UNSPEC) != 0)
+ if (ip_route_me_harder(par_net(par), newskb->sk, newskb, RTN_UNSPEC) != 0)
goto free_nskb;
newip->ttl = ip4_dst_hoplimit(skb_dst(newskb));
--- a/extensions/xt_TARPIT.c
+++ b/extensions/xt_TARPIT.c
@@ -261,7 +261,7 @@ static void tarpit_tcp4(struct net *net,
#endif
addr_type = RTN_LOCAL;
- if (ip_route_me_harder(net, nskb, addr_type))
+ if (ip_route_me_harder(net, nskb->sk, nskb, addr_type))
goto free_nskb;
else
niph = ip_hdr(nskb);
@@ -400,7 +400,7 @@ static void tarpit_tcp6(struct net *net,
IPPROTO_TCP,
csum_partial(tcph, sizeof(struct tcphdr), 0));
- if (ip6_route_me_harder(net, nskb))
+ if (ip6_route_me_harder(net, nskb->sk, nskb))
goto free_nskb;
nskb->ip_summed = CHECKSUM_NONE;