diff options
author | Peter Oskolkov <posk@google.com> | 2018-12-24 21:57:17 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-12-25 00:27:56 +0100 |
commit | c92c81df93df95dafbf6926613ce0b436227b007 (patch) | |
tree | ce78a0a0ef1f8601e4c819a77c214cc9bea381c7 /include | |
parent | drivers/net: appletalk/cops: remove redundant if statement and mask (diff) | |
download | linux-c92c81df93df95dafbf6926613ce0b436227b007.tar.xz linux-c92c81df93df95dafbf6926613ce0b436227b007.zip |
net: dccp: fix kernel crash on module load
Patch eedbbb0d98b2 "net: dccp: initialize (addr,port) ..."
added calling to inet_hashinfo2_init() from dccp_init().
However, inet_hashinfo2_init() is marked as __init(), and
thus the kernel panics when dccp is loaded as module. Removing
__init() tag from inet_hashinfo2_init() is not feasible because
it calls into __init functions in mm.
This patch adds inet_hashinfo2_init_mod() function that can
be called after the init phase is done; changes dccp_init() to
call the new function; un-marks inet_hashinfo2_init() as
exported.
Fixes: eedbbb0d98b2 ("net: dccp: initialize (addr,port) ...")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Peter Oskolkov <posk@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/inet_hashtables.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index 0ce460e93dc4..babb14136705 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h @@ -237,6 +237,7 @@ void inet_hashinfo2_init(struct inet_hashinfo *h, const char *name, unsigned long numentries, int scale, unsigned long low_limit, unsigned long high_limit); +int inet_hashinfo2_init_mod(struct inet_hashinfo *h); bool inet_ehash_insert(struct sock *sk, struct sock *osk); bool inet_ehash_nolisten(struct sock *sk, struct sock *osk); |