aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-grsec/0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-01-24 12:08:07 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-01-24 15:06:09 +0000
commit441cf9f59a263ca7f85b96ec71f0d50b5e223be5 (patch)
tree238d57847db69d5069ff27a1be69d8ad8e06e128 /main/linux-grsec/0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch
parent04dd0f555be6ee54c06d08db0516fbccc8a5d8d7 (diff)
downloadaports-441cf9f59a263ca7f85b96ec71f0d50b5e223be5.tar.gz
aports-441cf9f59a263ca7f85b96ec71f0d50b5e223be5.tar.bz2
aports-441cf9f59a263ca7f85b96ec71f0d50b5e223be5.tar.xz
main/linux-grsec: upgrade to 3.2.1 and update config
- set utf8 as default charset for filesystem NLS and FAT - enable xattr for squashfs - enable latencytop - disable IOMega ZIP drives - disable PCMCIA SCSI drivers - disable CAN subsystem - disable CAIF sysbsystem - disable Power Supply drivers - disable Voltage and regulators - disable Dallas 1-wire support
Diffstat (limited to 'main/linux-grsec/0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch')
-rw-r--r--main/linux-grsec/0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/main/linux-grsec/0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch b/main/linux-grsec/0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch
deleted file mode 100644
index d43160f1fa..0000000000
--- a/main/linux-grsec/0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 113ab386c7d6625cff284fb10952ff69a58c18a4 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <eric.dumazet@gmail.com>
-Date: Fri, 14 Oct 2011 04:57:46 +0000
-Subject: [PATCH] ip_gre: dont increase dev->needed_headroom on a live device
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It seems ip_gre is able to change dev->needed_headroom on the fly.
-
-Its is not legal unfortunately and triggers a BUG in raw_sendmsg()
-
-skb = sock_alloc_send_skb(sk, ... + LL_ALLOCATED_SPACE(rt->dst.dev)
-
-< another cpu change dev->needed_headromm (making it bigger)
-
-...
-skb_reserve(skb, LL_RESERVED_SPACE(rt->dst.dev));
-
-We end with LL_RESERVED_SPACE() being bigger than LL_ALLOCATED_SPACE()
--> we crash later because skb head is exhausted.
-
-Bug introduced in commit 243aad83 in 2.6.34 (ip_gre: include route
-header_len in max_headroom calculation)
-
-Reported-by: Elmar Vonlanthen <evonlanthen@gmail.com>
-Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
-CC: Timo Teräs <timo.teras@iki.fi>
-CC: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/ipv4/ip_gre.c | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
-index d7bb94c..d55110e 100644
---- a/net/ipv4/ip_gre.c
-+++ b/net/ipv4/ip_gre.c
-@@ -835,8 +835,6 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
- if (skb_headroom(skb) < max_headroom || skb_shared(skb)||
- (skb_cloned(skb) && !skb_clone_writable(skb, 0))) {
- struct sk_buff *new_skb = skb_realloc_headroom(skb, max_headroom);
-- if (max_headroom > dev->needed_headroom)
-- dev->needed_headroom = max_headroom;
- if (!new_skb) {
- ip_rt_put(rt);
- dev->stats.tx_dropped++;
---
-1.7.7
-