Skip to content

Commit c178e48

Browse files
edumazetgregkh
authored andcommitted
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: 06635a3 ("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>
1 parent 0b7860d commit c178e48

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

net/core/flow_dissector.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,4 +949,4 @@ static int __init init_default_flow_dissectors(void)
949949
return 0;
950950
}
951951

952-
late_initcall_sync(init_default_flow_dissectors);
952+
core_initcall(init_default_flow_dissectors);

0 commit comments

Comments
 (0)