projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
29ab5a3
)
ipv6: dccp: add missing bind_conflict to dccp_ipv6_mapped
author
Eric Dumazet
<
[email protected]
>
Thu, 3 Nov 2016 15:59:46 +0000
(08:59 -0700)
committer
David S. Miller
<
[email protected]
>
Thu, 3 Nov 2016 20:50:27 +0000
(16:50 -0400)
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 <
[email protected]
>
Reported-by: Andrey Konovalov <
[email protected]
>
Tested-by: Andrey Konovalov <
[email protected]
>
Cc: Arnaldo Carvalho de Melo <
[email protected]
>
Acked-by: Arnaldo Carvalho de Melo <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/dccp/ipv6.c
patch
|
blob
|
history
diff --git
a/net/dccp/ipv6.c
b/net/dccp/ipv6.c
index b2a43af967e5b150449666cf96cb9a9c2c24eb05..715e5d1dc10720adbc912ec67aef11905eeb96a1 100644
(file)
--- a/
net/dccp/ipv6.c
+++ b/
net/dccp/ipv6.c
@@
-958,6
+958,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,