From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 442F5C433ED for ; Mon, 20 Jul 2020 15:50:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 104C32065E for ; Mon, 20 Jul 2020 15:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260254; bh=MSSuzrTjBxIywH7AGVb1SkCXr5Meme8CiHb0TaLnz/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=djtMkVG87x9pMCQwhB0Y3v8EWcaPXqeM0zaJH+FqmnbtgZ6fo9dFF7LCBQTxXMF6A bWtsbOeeYQOvLQo1igSzHNtvvXh6OBibZZBy5G7zLvOvHyW29lIm1c9wnRw63sNMH/ lT1tVzlRymSSkfE6phjb5UDkSCmPU2JVKSZbiuVM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731165AbgGTPuw (ORCPT ); Mon, 20 Jul 2020 11:50:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:47334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729044AbgGTPuo (ORCPT ); Mon, 20 Jul 2020 11:50:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A75B520657; Mon, 20 Jul 2020 15:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260244; bh=MSSuzrTjBxIywH7AGVb1SkCXr5Meme8CiHb0TaLnz/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CwKYYBXj011YR2UXoSeE1OJa/3w8XDWGODSGTn5rxFEdwKnThRlsYN33key1anEI0 gh7qBA3qEKHnIwMZ9lbfYtvddQxRb5DRG3V7YYpsRFUMPIoJzQBt6J3wmmGb4W8HH7 g8LK9m/EfW9TP6GTOT1uy6b0XDzcslQ8FTYCVEbQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Wouters , Sabrina Dubroca , "David S. Miller" Subject: [PATCH 4.19 004/133] ipv4: fill fl4_icmp_{type,code} in ping_v4_sendmsg Date: Mon, 20 Jul 2020 17:35:51 +0200 Message-Id: <20200720152803.950494317@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152803.732195882@linuxfoundation.org> References: <20200720152803.732195882@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sabrina Dubroca [ Upstream commit 5eff06902394425c722f0a44d9545909a8800f79 ] 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 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 The Libreswan test suite found this problem after Fedora changed the value for the sysctl net.ipv4.ping_group_range. Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind") Reported-by: Paul Wouters Tested-by: Paul Wouters Signed-off-by: Sabrina Dubroca Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ping.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -791,6 +791,9 @@ static int ping_v4_sendmsg(struct sock * 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)) {