]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.8-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Nov 2016 15:35:06 +0000 (16:35 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Nov 2016 15:35:06 +0000 (16:35 +0100)
added patches:
flow_dissect-call-init_default_flow_dissectors-earlier.patch

queue-4.8/flow_dissect-call-init_default_flow_dissectors-earlier.patch [new file with mode: 0644]
queue-4.8/series

diff --git a/queue-4.8/flow_dissect-call-init_default_flow_dissectors-earlier.patch b/queue-4.8/flow_dissect-call-init_default_flow_dissectors-earlier.patch
new file mode 100644 (file)
index 0000000..f3be4ef
--- /dev/null
@@ -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
+@@ -945,4 +945,4 @@ static int __init init_default_flow_diss
+       return 0;
+ }
+-late_initcall_sync(init_default_flow_dissectors);
++core_initcall(init_default_flow_dissectors);
index fabc4e06e35c9a9a85fb932d6aaace6fefede155..ce86d7f0d9ed1ec14be21ba5d2745c711e7ae94a 100644 (file)
@@ -33,3 +33,4 @@ powerpc-mm-fixup-kernel-read-only-mapping.patch
 powerpc-boot-fix-the-early-opal-console-wrappers.patch
 can-bcm-fix-support-for-can-fd-frames.patch
 mm-oom-stop-pre-mature-high-order-oom-killer-invocations.patch
+flow_dissect-call-init_default_flow_dissectors-earlier.patch