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 87784C33CAF for ; Thu, 16 Jan 2020 18:02:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 657F1214AF for ; Thu, 16 Jan 2020 18:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579197746; bh=3wXdhz+W416QKvy2CKU3xe6qcWgqeJ5hbZ/1s8bVmeQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CCwOiWMYEsJFhaUC9JXhriZ7wAAG+V99pBjvha82uERbwLOK4aJN0cgge/v4usdpA PgSMpnAGAsEx7nGV+PvjPn9tEc6azQLS4PEpR4rMaGDoJ7ntu3bBQWV8KNfeqVMZqj TP3qEG2jtUIDCRZmipNp33ekph/6xSfaV4a2XvGM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405632AbgAPSCZ (ORCPT ); Thu, 16 Jan 2020 13:02:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:58688 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405592AbgAPRlK (ORCPT ); Thu, 16 Jan 2020 12:41:10 -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 A503D246AA; Thu, 16 Jan 2020 17:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196469; bh=3wXdhz+W416QKvy2CKU3xe6qcWgqeJ5hbZ/1s8bVmeQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VQuWdEnpzxRvc2DUBZa7IvV3pOMsU2JHo20eYtNp2swtvWdeCHVNOnn+w73uKx5lR qmctio5cO09pWkMX8R9m7MHxnJ8+VCWlnvhswrnjRUvRllmk8/RnCym6s+6pkZNYXC ww3jMkCbUUrDzzLJTFBUXssJc50myKRKWSo+0TrQ= 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.9 220/251] net: netem: correct the parent's backlog when corrupted packet was dropped Date: Thu, 16 Jan 2020 12:36:09 -0500 Message-Id: <20200116173641.22137-180-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 11c4c93f5ded..e06491314d59 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -609,6 +609,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