diff options
author | Eric Dumazet <edumazet@google.com> | 2016-11-03 08:59:46 -0700 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2017-03-16 02:27:20 +0000 |
commit | b48001f3958535b05304c1c9b106959fc18a2d64 (patch) | |
tree | d628c4ba95b59e83e2aa199f15d62dab5f28da3c | |
parent | 968953df833c61fce5adcc0612efeaced24e5719 (diff) | |
download | linux-stable-b48001f3958535b05304c1c9b106959fc18a2d64.tar.gz linux-stable-b48001f3958535b05304c1c9b106959fc18a2d64.tar.bz2 linux-stable-b48001f3958535b05304c1c9b106959fc18a2d64.zip |
ipv6: dccp: add missing bind_conflict to dccp_ipv6_mapped
[ Upstream commit 990ff4d84408fc55942ca6644f67e361737b3d8e ]
While fuzzing kernel with syzkaller, Andrey reported a nasty crash
in inet6_bind() caused by DCCP lacking a required method.
Fixes: ab1e0a13d7029 ("[SOCK] proto: Add hashinfo member to struct proto")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r-- | net/dccp/ipv6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 8e243113784e..b42151be8afa 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -1024,6 +1024,7 @@ static const struct inet_connection_sock_af_ops dccp_ipv6_mapped = { .getsockopt = ipv6_getsockopt, .addr2sockaddr = inet6_csk_addr2sockaddr, .sockaddr_len = sizeof(struct sockaddr_in6), + .bind_conflict = inet6_csk_bind_conflict, #ifdef CONFIG_COMPAT .compat_setsockopt = compat_ipv6_setsockopt, .compat_getsockopt = compat_ipv6_getsockopt, |