From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1025227AC5C; Thu, 15 Jan 2026 17:39:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768498798; cv=none; b=rRoSysC3s+nllVe+hVfntrhXACgfrI9vZ+LJZUsK9JYHdjweBfv+Wjn+Pi8Ix45gtEgbmJKuUj5/lvTASH0bm+kseu063kIl+1g2rRQ/EJCPItwJQ/dy7GhAQFN7p1p1JeIqbSuAcU0D0GoQgiut2ieQl4rZkPEl/H78dZAgvuk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768498798; c=relaxed/simple; bh=fMihiizpdKpEMnpcWMX1AODdhoRy+NIkOtCSqd9R49w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pGZKw6LOLT1EPdoBx/I2UvkHP80NkxwpdBwtyHByKR8X8fsZcjsas3ImPNIZIjvvDL6m+FUgq3wuNlXKkIbFuqUoJ+E8e2iJbAz/t0/QEC+zM48j3CU8QsJ+4VWLAM5AqMjQeijJj3lBpiN09yBKTnkhKzKoyDsg9P+KlI/qS7E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TwPUwJm9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TwPUwJm9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E373C116D0; Thu, 15 Jan 2026 17:39:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1768498797; bh=fMihiizpdKpEMnpcWMX1AODdhoRy+NIkOtCSqd9R49w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TwPUwJm9lg1QUymWnOZ1GfxvoHAFOmnLMo5tLsREXOs5hOyFcr3eHLrbyTWwQqkdb KKJZCYxn7BnxdOiPM/S3d+EnO7N1YXmjtgkzOe1Mr6qdTGEUuO/AbnewdmL2r1Lzdb DNrT1xSWvInBzLe2yrfzsCRfuwr96iMYILNMAmvc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "yuan.gao" , Ido Schimmel , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 531/554] inet: ping: Fix icmp out counting Date: Thu, 15 Jan 2026 17:49:57 +0100 Message-ID: <20260115164305.546728196@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260115164246.225995385@linuxfoundation.org> References: <20260115164246.225995385@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: yuan.gao [ Upstream commit 4c0856c225b39b1def6c9a6bc56faca79550da13 ] When the ping program uses an IPPROTO_ICMP socket to send ICMP_ECHO messages, ICMP_MIB_OUTMSGS is counted twice. ping_v4_sendmsg ping_v4_push_pending_frames ip_push_pending_frames ip_finish_skb __ip_make_skb icmp_out_count(net, icmp_type); // first count icmp_out_count(sock_net(sk), user_icmph.type); // second count However, when the ping program uses an IPPROTO_RAW socket, ICMP_MIB_OUTMSGS is counted correctly only once. Therefore, the first count should be removed. Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind") Signed-off-by: yuan.gao Reviewed-by: Ido Schimmel Tested-by: Ido Schimmel Link: https://patch.msgid.link/20251224063145.3615282-1-yuan.gao@ucloud.cn Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv4/ping.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index c4a2565da2806..069ac54ef7565 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -844,10 +844,8 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) out_free: if (free) kfree(ipc.opt); - if (!err) { - icmp_out_count(sock_net(sk), user_icmph.type); + if (!err) return len; - } return err; do_confirm: -- 2.51.0