nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: dccp: initialize (addr,port) listening hashtable

Browse source 
Commit d9fbc7f643 "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: d9fbc7f643 "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>
This commit is contained in:
Peter Oskolkov 2018-12-16 15:42:48 -08:00 committed by David S. Miller
parent 6a95147c51
commit eedbbb0d98
2 changed files with 4 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
net/dccp/proto.c
View file

@ -1141,6 +1141,9 @@ static int __init dccp_init(void)
goto out_fail; goto out_fail;
rc = -ENOBUFS; rc = -ENOBUFS;
inet_hashinfo_init(&dccp_hashinfo); inet_hashinfo_init(&dccp_hashinfo);
inet_hashinfo2_init(&dccp_hashinfo, "dccp_listen_portaddr_hash",
INET_LHTABLE_SIZE, 21, /* one slot per 2 MB*/
0, 64 * 1024);
dccp_hashinfo.bind_bucket_cachep = dccp_hashinfo.bind_bucket_cachep =
kmem_cache_create("dccp_bind_bucket", kmem_cache_create("dccp_bind_bucket",
sizeof(struct inet_bind_bucket), 0, sizeof(struct inet_bind_bucket), 0,

1
net/ipv4/inet_hashtables.c
View file

@ -785,6 +785,7 @@ void __init inet_hashinfo2_init(struct inet_hashinfo *h, const char *name,
h->lhash2[i].count = 0; h->lhash2[i].count = 0;
} }
} }
EXPORT_SYMBOL_GPL(inet_hashinfo2_init);
int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo) int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo)
{ {