diff options
| author | Felix Fietkau <nbd@nbd.name> | 2020-01-23 17:40:06 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-01-28 16:39:02 +0100 |
| commit | 8ab2b42fac4fcbb4a294f3405aa15daeb706a9bd (patch) | |
| tree | 3e325d797df2090a0d443fab33d4c22875959e13 /target/linux | |
| parent | 47935940d67147e3ec8dbfcb56ae14f1235369c5 (diff) | |
| download | upstream-8ab2b42fac4fcbb4a294f3405aa15daeb706a9bd.tar.gz upstream-8ab2b42fac4fcbb4a294f3405aa15daeb706a9bd.tar.bz2 upstream-8ab2b42fac4fcbb4a294f3405aa15daeb706a9bd.zip | |
kernel: fix dst reference leak in flow offload
Fixes a significant amount of leaked memory with lots of connections
Ref: PR#2721
Tested-by: Jerome Benoit <jerome.benoit@sap.com> [WRT1900AC v1]
Signed-off-by: Felix Fietkau <nbd@nbd.name>
[removed 4.19 patch during cherry-pick]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit c6c4701def07cd01a1b077cee93f64a9b2e3b5be)
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch b/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch index a78b4cdf9c..7c93feccdc 100644 --- a/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch +++ b/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o --- /dev/null +++ b/net/netfilter/xt_FLOWOFFLOAD.c -@@ -0,0 +1,421 @@ +@@ -0,0 +1,422 @@ +/* + * Copyright (C) 2018 Felix Fietkau <nbd@nbd.name> + * @@ -330,15 +330,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> + + this_dst = xt_flowoffload_dst(ct, !dir, par, xt_out(par)->ifindex); + other_dst = xt_flowoffload_dst(ct, dir, par, xt_in(par)->ifindex); ++ ++ route->tuple[dir].dst = this_dst; ++ route->tuple[!dir].dst = other_dst; ++ + if (!this_dst || !other_dst) + return -ENOENT; + + if (dst_xfrm(this_dst) || dst_xfrm(other_dst)) + return -EINVAL; + -+ route->tuple[dir].dst = this_dst; -+ route->tuple[!dir].dst = other_dst; -+ + return 0; +} + @@ -350,7 +351,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> + enum ip_conntrack_info ctinfo; + enum ip_conntrack_dir dir; + struct nf_flow_route route; -+ struct flow_offload *flow; ++ struct flow_offload *flow = NULL; + struct nf_conn *ct; + struct net *net; + @@ -392,12 +393,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> + + dir = CTINFO2DIR(ctinfo); + -+ if (xt_flowoffload_route(skb, ct, par, &route, dir) < 0) -+ goto err_flow_route; ++ if (xt_flowoffload_route(skb, ct, par, &route, dir) == 0) ++ flow = flow_offload_alloc(ct, &route); ++ ++ dst_release(route.tuple[dir].dst); ++ dst_release(route.tuple[!dir].dst); + -+ flow = flow_offload_alloc(ct, &route); + if (!flow) -+ goto err_flow_alloc; ++ goto err_flow_route; + + if (tcph) { + ct->proto.tcp.seen[0].flags |= IP_CT_TCP_FLAG_BE_LIBERAL; @@ -421,8 +424,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> + +err_flow_add: + flow_offload_free(flow); -+err_flow_alloc: -+ dst_release(route.tuple[!dir].dst); +err_flow_route: + clear_bit(IPS_OFFLOAD_BIT, &ct->status); + return XT_CONTINUE; |