Commit 5eff0690 authored Jul 03, 2020 by Sabrina Dubroca Committed by David S. Miller Jul 07, 2020

ipv4: fill fl4_icmp_{type,code} in ping_v4_sendmsg



IPv4 ping sockets don't set fl4.fl4_icmp_{type,code}, which leads to
incomplete IPsec ACQUIRE messages being sent to userspace. Currently,
both raw sockets and IPv6 ping sockets set those fields.

Expected output of "ip xfrm monitor":
    acquire proto esp
      sel src 10.0.2.15/32 dst 8.8.8.8/32 proto icmp type 8 code 0 dev ens4
      policy src 10.0.2.15/32 dst 8.8.8.8/32
        <snip>

Currently with ping sockets:
    acquire proto esp
      sel src 10.0.2.15/32 dst 8.8.8.8/32 proto icmp type 0 code 0 dev ens4
      policy src 10.0.2.15/32 dst 8.8.8.8/32
        <snip>

The Libreswan test suite found this problem after Fedora changed the
value for the sysctl net.ipv4.ping_group_range.

Fixes: c319b4d7 ("net: ipv4: add IPPROTO_ICMP socket kind")
Reported-by: Paul Wouters <pwouters@redhat.com>
Tested-by: Paul Wouters <pwouters@redhat.com>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7cdaa4cc

net/ipv4/ping.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -786,6 +786,9 @@ static int ping_v4_sendmsg(struct sock sk, struct msghdr msg, size_t len)
		inet_sk_flowi_flags(sk), faddr, saddr, 0, 0,
		sk->sk_uid);

		fl4.fl4_icmp_type = user_icmph.type;
		fl4.fl4_icmp_code = user_icmph.code;

		security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
		rt = ip_route_output_flow(net, &fl4, sk);
		if (IS_ERR(rt)) {

Admin message