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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 CCECCC4743C for ; Mon, 21 Jun 2021 18:10:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B19D461026 for ; Mon, 21 Jun 2021 18:10:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233957AbhFUSMf (ORCPT ); Mon, 21 Jun 2021 14:12:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:45148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234289AbhFUSFD (ORCPT ); Mon, 21 Jun 2021 14:05:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 50E0661408; Mon, 21 Jun 2021 17:56:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624298173; bh=CbFnlNy/IEuBD0otczRC5A76VfyeGiM+rihMQ6Kad1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h9sPiPEPjUkjASNFgwwWe0O+/PqlZpweC80PDlZmD3VRIluOninH5lfms5K6q+mfK 5ACNepLpYQPCSincCv3cueFPloqeiyjs4+F+E2CWPGtk4MW0TyvSI0X7utKov3dqxG 6rjRRbSJsfm8ZPyZeJx7BGirCE4ieZwe8+wjeeufJZILXMBw0/7H5tERer8ZH1Gtyv qhzfE4ZWT2wjSqjFfGvvVNqI09c2+u8+XLAPFwSrRMDhAVYHK10Cx/zvN6UpzxBQ6I 5kHWTCnr3jx4B3rt3sRXzHHd0NqAKogyS8CR5lRAumlaCEJBoepYapWgQEJdct9DFf vEdRvkqslxsyQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheng Yongjun , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 3/9] ping: Check return value of function 'ping_queue_rcv_skb' Date: Mon, 21 Jun 2021 13:56:01 -0400 Message-Id: <20210621175608.736581-3-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621175608.736581-1-sashal@kernel.org> References: <20210621175608.736581-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zheng Yongjun [ Upstream commit 9d44fa3e50cc91691896934d106c86e4027e61ca ] Function 'ping_queue_rcv_skb' not always return success, which will also return fail. If not check the wrong return value of it, lead to function `ping_rcv` return success. Signed-off-by: Zheng Yongjun Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv4/ping.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index a3abd136b8e7..56d89dfd8831 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -978,6 +978,7 @@ bool ping_rcv(struct sk_buff *skb) struct sock *sk; struct net *net = dev_net(skb->dev); struct icmphdr *icmph = icmp_hdr(skb); + bool rc = false; /* We assume the packet has already been checked by icmp_rcv */ @@ -992,14 +993,15 @@ bool ping_rcv(struct sk_buff *skb) struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC); pr_debug("rcv on socket %p\n", sk); - if (skb2) - ping_queue_rcv_skb(sk, skb2); + if (skb2 && !ping_queue_rcv_skb(sk, skb2)) + rc = true; sock_put(sk); - return true; } - pr_debug("no socket, dropping\n"); - return false; + if (!rc) + pr_debug("no socket, dropping\n"); + + return rc; } EXPORT_SYMBOL_GPL(ping_rcv); -- 2.30.2