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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 5468CC33CAF for ; Thu, 16 Jan 2020 17:23:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 12F4F2467E for ; Thu, 16 Jan 2020 17:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195398; bh=Pzd0a7Xe9wrKAq2qwT7jhPVjmbyQ/lDkJMOn2OSbZKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1R/vt9NBd86dBqhVB/QDlQo03RxUpq1mp7LQuLiRV1oDGsj8PVa5tkv4DAuVWIgLv o5dHibTY0atAotsHI3bdiWX85uObZJdHe0qc9n5glGUTDlaaVgDG6F+ptcneiFDz9V Qc3nhQRlOPY2gIX4ehxJsqA3+hzUnjpvp/fpnvUc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390689AbgAPRNQ (ORCPT ); Thu, 16 Jan 2020 12:13:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:57298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390646AbgAPRNH (ORCPT ); Thu, 16 Jan 2020 12:13:07 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F0EC12469D; Thu, 16 Jan 2020 17:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194786; bh=Pzd0a7Xe9wrKAq2qwT7jhPVjmbyQ/lDkJMOn2OSbZKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e9ZGMr0wlHxqo871n1IOEerNVCOTOP2FIW634ukT3FdwPuKMQK2Ml4PL4uYsnCIZx SmFv4Hpn6ZChSBVSk2jH11BRDBMbgF8sAIVz22DulE989W6qB/9Ljyz4RlhUFdwUAk 3j3gXbpfL73cZduF7gM604JwTK5K5cpfsrchlZ5o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jakub Kicinski , Simon Horman , "David S . Miller" , Sasha Levin , netem@lists.linux-foundation.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 601/671] net: netem: correct the parent's backlog when corrupted packet was dropped Date: Thu, 16 Jan 2020 12:03:59 -0500 Message-Id: <20200116170509.12787-338-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jakub Kicinski [ Upstream commit e0ad032e144731a5928f2d75e91c2064ba1a764c ] If packet corruption failed we jump to finish_segs and return NET_XMIT_SUCCESS. Seeing success will make the parent qdisc increment its backlog, that's incorrect - we need to return NET_XMIT_DROP. Fixes: 6071bd1aa13e ("netem: Segment GSO packets on enqueue") Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/sched/sch_netem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 7660aa5b80da..014a28d8dd4f 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -607,6 +607,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, } /* Parent qdiscs accounted for 1 skb of size @prev_len */ qdisc_tree_reduce_backlog(sch, -(nb - 1), -(len - prev_len)); + } else if (!skb) { + return NET_XMIT_DROP; } return NET_XMIT_SUCCESS; } -- 2.20.1