Commit 0aa89f1b authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman

net: ping: do not abuse udp_poll()


[ Upstream commit 77d4b1d3 ]

Alexander reported various KASAN messages triggered in recent kernels

The problem is that ping sockets should not use udp_poll() in the first
place, and recent changes in UDP stack finally exposed this old bug.

Fixes: c319b4d7 ("net: ipv4: add IPPROTO_ICMP socket kind")
Fixes: 6d0bfe22 ("net: ipv6: Add IPv6 support to the ping socket.")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarSasha Levin <alexander.levin@verizon.com>
Cc: Solar Designer <solar@openwall.com>
Cc: Vasiliy Kulikov <segoon@openwall.com>
Cc: Lorenzo Colitti <lorenzo@google.com>
Acked-By: default avatarLorenzo Colitti <lorenzo@google.com>
Tested-By: default avatarLorenzo Colitti <lorenzo@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 599a4478
...@@ -1001,6 +1001,7 @@ int inet6_hash_connect(struct inet_timewait_death_row *death_row, ...@@ -1001,6 +1001,7 @@ int inet6_hash_connect(struct inet_timewait_death_row *death_row,
*/ */
extern const struct proto_ops inet6_stream_ops; extern const struct proto_ops inet6_stream_ops;
extern const struct proto_ops inet6_dgram_ops; extern const struct proto_ops inet6_dgram_ops;
extern const struct proto_ops inet6_sockraw_ops;
struct group_source_req; struct group_source_req;
struct group_filter; struct group_filter;
......
...@@ -1015,7 +1015,7 @@ static struct inet_protosw inetsw_array[] = ...@@ -1015,7 +1015,7 @@ static struct inet_protosw inetsw_array[] =
.type = SOCK_DGRAM, .type = SOCK_DGRAM,
.protocol = IPPROTO_ICMP, .protocol = IPPROTO_ICMP,
.prot = &ping_prot, .prot = &ping_prot,
.ops = &inet_dgram_ops, .ops = &inet_sockraw_ops,
.flags = INET_PROTOSW_REUSE, .flags = INET_PROTOSW_REUSE,
}, },
......
...@@ -198,7 +198,7 @@ static struct inet_protosw pingv6_protosw = { ...@@ -198,7 +198,7 @@ static struct inet_protosw pingv6_protosw = {
.type = SOCK_DGRAM, .type = SOCK_DGRAM,
.protocol = IPPROTO_ICMPV6, .protocol = IPPROTO_ICMPV6,
.prot = &pingv6_prot, .prot = &pingv6_prot,
.ops = &inet6_dgram_ops, .ops = &inet6_sockraw_ops,
.flags = INET_PROTOSW_REUSE, .flags = INET_PROTOSW_REUSE,
}; };
......
...@@ -1330,7 +1330,7 @@ void raw6_proc_exit(void) ...@@ -1330,7 +1330,7 @@ void raw6_proc_exit(void)
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
/* Same as inet6_dgram_ops, sans udp_poll. */ /* Same as inet6_dgram_ops, sans udp_poll. */
static const struct proto_ops inet6_sockraw_ops = { const struct proto_ops inet6_sockraw_ops = {
.family = PF_INET6, .family = PF_INET6,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.release = inet6_release, .release = inet6_release,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment