From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 30 Nov 2016 15:34:49 +0000 (+0100)
Subject: 4.4-stable patches
X-Git-Tag: v4.4.36~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cf6818febf7010d16cb11b7a986182fad3e4384;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	flow_dissect-call-init_default_flow_dissectors-earlier.patch
---

diff --git a/queue-4.4/flow_dissect-call-init_default_flow_dissectors-earlier.patch b/queue-4.4/flow_dissect-call-init_default_flow_dissectors-earlier.patch
new file mode 100644
index 00000000000..7c61318a40f
--- /dev/null
+++ b/queue-4.4/flow_dissect-call-init_default_flow_dissectors-earlier.patch
@@ -0,0 +1,40 @@
+From c9b8af1330198ae241cd545e1f040019010d44d9 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Tue, 22 Nov 2016 11:17:30 -0800
+Subject: flow_dissect: call init_default_flow_dissectors() earlier
+
+From: Eric Dumazet <edumazet@google.com>
+
+commit c9b8af1330198ae241cd545e1f040019010d44d9 upstream.
+
+Andre Noll reported panics after my recent fix (commit 34fad54c2537
+"net: __skb_flow_dissect() must cap its return value")
+
+After some more headaches, Alexander root caused the problem to
+init_default_flow_dissectors() being called too late, in case
+a network driver like IGB is not a module and receives DHCP message
+very early.
+
+Fix is to call init_default_flow_dissectors() much earlier,
+as it is a core infrastructure and does not depend on another
+kernel service.
+
+Fixes: 06635a35d13d4 ("flow_dissect: use programable dissector in skb_flow_dissect and friends")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Reported-by: Andre Noll <maan@tuebingen.mpg.de>
+Diagnosed-by: Alexander Duyck <alexander.h.duyck@intel.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/core/flow_dissector.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/core/flow_dissector.c
++++ b/net/core/flow_dissector.c
+@@ -949,4 +949,4 @@ static int __init init_default_flow_diss
+ 	return 0;
+ }
+ 
+-late_initcall_sync(init_default_flow_dissectors);
++core_initcall(init_default_flow_dissectors);
diff --git a/queue-4.4/series b/queue-4.4/series
index eb3a8aa59c5..4226916dee2 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -19,3 +19,4 @@ drm-radeon-ensure-vblank-interrupt-is-enabled-on-dpms-transition-to-on.patch
 mei-me-disable-driver-on-spt-sps-firmware.patch
 mei-me-fix-place-for-kaby-point-device-ids.patch
 mei-fix-return-value-on-disconnection.patch
+flow_dissect-call-init_default_flow_dissectors-earlier.patch