diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-07-16 08:14:11 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-07-16 08:14:11 +0000 |
| commit | 55daf16873e11760ff848bfa80984939e9c8952c (patch) | |
| tree | 2ce2eae9a51a6ef70662349449f876206f233d5b | |
| parent | b993f7b5582f64071329017780e0ad39951c7fd2 (diff) | |
| download | aports-55daf16873e11760ff848bfa80984939e9c8952c.tar.bz2 aports-55daf16873e11760ff848bfa80984939e9c8952c.tar.xz | |
main/linux-grsec: fix for clampmss
http://marc.info/?l=linux-netdev&m=134242367623707&w=2
| -rw-r--r-- | main/linux-grsec/0001-Revert-ipv4-Don-t-use-the-cached-pmtu-informations-f.patch | 36 | ||||
| -rw-r--r-- | main/linux-grsec/APKBUILD | 4 |
2 files changed, 39 insertions, 1 deletions
diff --git a/main/linux-grsec/0001-Revert-ipv4-Don-t-use-the-cached-pmtu-informations-f.patch b/main/linux-grsec/0001-Revert-ipv4-Don-t-use-the-cached-pmtu-informations-f.patch new file mode 100644 index 0000000000..4b5f2ee94a --- /dev/null +++ b/main/linux-grsec/0001-Revert-ipv4-Don-t-use-the-cached-pmtu-informations-f.patch @@ -0,0 +1,36 @@ +From 84799010fc72913eb398674f8da7df525bde8fcb Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 16 Jul 2012 08:14:31 +0200 +Subject: [PATCH] Revert "ipv4: Don't use the cached pmtu informations for + input routes" + +This reverts commit 261663b0ee2ee8e3947f4c11c1a08be18cd2cea1. +--- + net/ipv4/route.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/net/ipv4/route.c b/net/ipv4/route.c +index 167ea10..f21e282 100644 +--- a/net/ipv4/route.c ++++ b/net/ipv4/route.c +@@ -1917,15 +1917,15 @@ static unsigned int ipv4_default_advmss(const struct dst_entry *dst) + + static unsigned int ipv4_mtu(const struct dst_entry *dst) + { +- const struct rtable *rt = (const struct rtable *) dst; + unsigned int mtu = dst_metric_raw(dst, RTAX_MTU); + +- if (mtu && rt_is_output_route(rt)) ++ if (mtu) + return mtu; + + mtu = dst->dev->mtu; + + if (unlikely(dst_metric_locked(dst, RTAX_MTU))) { ++ const struct rtable *rt = (const struct rtable *) dst; + + if (rt->rt_gateway != rt->rt_dst && mtu > 576) + mtu = 576; +-- +1.7.11.2 + diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 648fa1e7e8..10c951dc9c 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=3.3.8 _kernver=3.3 -pkgrel=2 +pkgrel=3 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -17,6 +17,7 @@ source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz grsecurity-2.9-3.3.8-201206042136.patch 0004-arp-flush-arp-cache-on-device-change.patch + 0001-Revert-ipv4-Don-t-use-the-cached-pmtu-informations-f.patch kernelconfig.x86 kernelconfig.x86_64 @@ -142,5 +143,6 @@ md5sums="7133f5a2086a7d7ef97abac610c094f5 linux-3.3.tar.xz e1714b5136a7f4dab1b5d2d7f98e2891 patch-3.3.8.xz 4a97aa5ad465a5d829e88c8234f75417 grsecurity-2.9-3.3.8-201206042136.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch +cb6fcd6e966e73c87a839c4c0183f81f 0001-Revert-ipv4-Don-t-use-the-cached-pmtu-informations-f.patch 0962abf0f03955adaa096218a54b950d kernelconfig.x86 335df337d087ff345e1d4c8297d75222 kernelconfig.x86_64" |