path: root/net/ipv4/inet_hashtables.c
diff options
authorPeter Oskolkov <posk@google.com>2018-12-16 15:42:48 -0800
committerDavid S. Miller <davem@davemloft.net>2018-12-17 23:11:48 -0800
commiteedbbb0d98b2a89250a8bb83d9c71b77881e5247 (patch)
tree69b9bf067315f9c8e3561d42d2a0b21abed330e4 /net/ipv4/inet_hashtables.c
parentMerge branch 'bnxt_en-next' (diff)
net: dccp: initialize (addr,port) listening hashtable
Commit d9fbc7f6431f "net: tcp: prefer listeners bound to an address" removes port-only listener lookups. This caused segfaults in DCCP lookups because DCCP did not initialize the (addr,port) hashtable. This patch adds said initialization. The only non-trivial issue here is the size of the new hashtable. It seemed reasonable to make it match the size of the port-only hashtable (= INET_LHTABLE_SIZE) that was used previously. Other parameters to inet_hashinfo2_init() match those used in TCP. V2 changes: marked inet_hashinfo2_init as an exported symbol so that DCCP compiles when configured as a module. Tested: syzcaller issues fixed; the second patch in the patchset tests that DCCP lookups work correctly. Fixes: d9fbc7f6431f "net: tcp: prefer listeners bound to an address" Reported-by: syzcaller <syzkaller@googlegroups.com> Signed-off-by: Peter Oskolkov <posk@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index cd03ab42705b..2445614de6a7 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -785,6 +785,7 @@ void __init inet_hashinfo2_init(struct inet_hashinfo *h, const char *name,
h->lhash2[i].count = 0;
int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo)