From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 2 May 2015 18:41:11 +0000 (+0200)
Subject: 4.0-stable patches
X-Git-Tag: v3.10.77~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d0581921b64b7fe88d335944d2cba1a22774e2c;p=thirdparty%2Fkernel%2Fstable-queue.git

4.0-stable patches

added patches:
	netfilter-bridge-really-save-frag_max_size-between-pre-and-post_routing.patch
---

diff --git a/queue-4.0/netfilter-bridge-really-save-frag_max_size-between-pre-and-post_routing.patch b/queue-4.0/netfilter-bridge-really-save-frag_max_size-between-pre-and-post_routing.patch
new file mode 100644
index 00000000000..ebb9258f05a
--- /dev/null
+++ b/queue-4.0/netfilter-bridge-really-save-frag_max_size-between-pre-and-post_routing.patch
@@ -0,0 +1,54 @@
+From 0b67c43ce36a9964f1d5e3f973ee19eefd3f9f8f Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw@strlen.de>
+Date: Wed, 1 Apr 2015 22:36:27 +0200
+Subject: netfilter: bridge: really save frag_max_size between PRE and POST_ROUTING
+
+From: Florian Westphal <fw@strlen.de>
+
+commit 0b67c43ce36a9964f1d5e3f973ee19eefd3f9f8f upstream.
+
+We also need to save/store in forward, else br_parse_ip_options call
+will zero frag_max_size as well.
+
+Fixes: 93fdd47e5 ('bridge: Save frag_max_size between PRE_ROUTING and POST_ROUTING')
+Signed-off-by: Florian Westphal <fw@strlen.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/bridge/br_netfilter.c |   17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+--- a/net/bridge/br_netfilter.c
++++ b/net/bridge/br_netfilter.c
+@@ -651,6 +651,13 @@ static int br_nf_forward_finish(struct s
+ 	struct net_device *in;
+ 
+ 	if (!IS_ARP(skb) && !IS_VLAN_ARP(skb)) {
++		int frag_max_size;
++
++		if (skb->protocol == htons(ETH_P_IP)) {
++			frag_max_size = IPCB(skb)->frag_max_size;
++			BR_INPUT_SKB_CB(skb)->frag_max_size = frag_max_size;
++		}
++
+ 		in = nf_bridge->physindev;
+ 		if (nf_bridge->mask & BRNF_PKT_TYPE) {
+ 			skb->pkt_type = PACKET_OTHERHOST;
+@@ -710,8 +717,14 @@ static unsigned int br_nf_forward_ip(con
+ 		nf_bridge->mask |= BRNF_PKT_TYPE;
+ 	}
+ 
+-	if (pf == NFPROTO_IPV4 && br_parse_ip_options(skb))
+-		return NF_DROP;
++	if (pf == NFPROTO_IPV4) {
++		int frag_max = BR_INPUT_SKB_CB(skb)->frag_max_size;
++
++		if (br_parse_ip_options(skb))
++			return NF_DROP;
++
++		IPCB(skb)->frag_max_size = frag_max;
++	}
+ 
+ 	/* The physdev module checks on this */
+ 	nf_bridge->mask |= BRNF_BRIDGED;
diff --git a/queue-4.0/series b/queue-4.0/series
index 48d408930c3..64de208eec0 100644
--- a/queue-4.0/series
+++ b/queue-4.0/series
@@ -218,3 +218,4 @@ memstick-mspro_block-add-missing-curly-braces.patch
 drivers-platform-parse-irq-flags-from-resources.patch
 driver-core-bus-goto-appropriate-labels-on-failure-in-bus_add_device.patch
 netfilter-x_tables-fix-cgroup-matching-on-non-full-sks.patch
+netfilter-bridge-really-save-frag_max_size-between-pre-and-post_routing.patch