aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-grsec/ipv4-remove-output-route-check-in-ipv4_mtu.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-01-17 10:43:40 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-01-17 11:59:38 +0000
commit3e8415b972139e5e2487f97a037766b7f60685ca (patch)
treeef7af26239eee6b079ab11fadb2b6e17cf882e58 /main/linux-grsec/ipv4-remove-output-route-check-in-ipv4_mtu.patch
parent50c82405a0505427879d8069d77532d2c05a1c76 (diff)
downloadaports-3e8415b972139e5e2487f97a037766b7f60685ca.tar.bz2
aports-3e8415b972139e5e2487f97a037766b7f60685ca.tar.xz
main/linux-grsec: backport XFRM PMTU and iptables CLAMPMSS regression fix
ref #1570
Diffstat (limited to 'main/linux-grsec/ipv4-remove-output-route-check-in-ipv4_mtu.patch')
-rw-r--r--main/linux-grsec/ipv4-remove-output-route-check-in-ipv4_mtu.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/main/linux-grsec/ipv4-remove-output-route-check-in-ipv4_mtu.patch b/main/linux-grsec/ipv4-remove-output-route-check-in-ipv4_mtu.patch
new file mode 100644
index 0000000000..241f9b3527
--- /dev/null
+++ b/main/linux-grsec/ipv4-remove-output-route-check-in-ipv4_mtu.patch
@@ -0,0 +1,38 @@
+From 38d523e2948162776903349c89d65f7b9370dadb Mon Sep 17 00:00:00 2001
+From: Steffen Klassert <steffen.klassert@secunet.com>
+Date: Wed, 16 Jan 2013 20:55:01 +0000
+Subject: [PATCH] ipv4: Remove output route check in ipv4_mtu
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+The output route check was introduced with git commit 261663b0
+(ipv4: Don't use the cached pmtu informations for input routes)
+during times when we cached the pmtu informations on the
+inetpeer. Now the pmtu informations are back in the routes,
+so this check is obsolete. It also had some unwanted side effects,
+as reported by Timo Teras and Lukas Tribus.
+
+Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
+Acked-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/ipv4/route.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/net/ipv4/route.c b/net/ipv4/route.c
+index 844a9ef..6e4a89c 100644
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -1120,7 +1120,7 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst)
+ if (!mtu || time_after_eq(jiffies, rt->dst.expires))
+ mtu = dst_metric_raw(dst, RTAX_MTU);
+
+- if (mtu && rt_is_output_route(rt))
++ if (mtu)
+ return mtu;
+
+ mtu = dst->dev->mtu;
+--
+1.7.6.5
+