diff options
author | Eric Dumazet <edumazet@google.com> | 2016-11-03 08:59:46 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-21 10:06:40 +0100 |
commit | 65d29c185614806fafa281e0902dc3b61fd9e37a (patch) | |
tree | d5a0b1f414cd92e546632930319151d02aabb640 /net/dccp | |
parent | 99131760a8851e6e5b2c9b24d0a68a3068923a08 (diff) | |
download | linux-stable-65d29c185614806fafa281e0902dc3b61fd9e37a.tar.gz linux-stable-65d29c185614806fafa281e0902dc3b61fd9e37a.tar.bz2 linux-stable-65d29c185614806fafa281e0902dc3b61fd9e37a.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/dccp')
-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 0773b6406c22..27c4e81efa24 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -948,6 +948,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, |