Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c178e480 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

flow_dissect: call init_default_flow_dissectors() earlier 



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: 06635a35 ("flow_dissect: use programable dissector in skb_flow_dissect and friends")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarAndre Noll <maan@tuebingen.mpg.de>
Diagnosed-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b7860d6

net/core/flow_dissector.c

+1 −1
Original line number Diff line number Diff line
@@ -949,4 +949,4 @@ static int __init init_default_flow_dissectors(void) 
	return 0;

}



late_initcall_sync(init_default_flow_dissectors);
 
core_initcall(init_default_flow_dissectors);