From patchwork Fri Jan 24 09:32:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 233118 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 41262C2D0DB for ; Fri, 24 Jan 2020 10:06:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1469620709 for ; Fri, 24 Jan 2020 10:06:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860409; bh=maeMNMQTEB9QDEHdX6dLnQmt1fBj7Sr6eZDP1VuBc2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FBVu7nURIB8QrC9ChuCGg52ccdcPZNiShS7wB0vw7893XKjvRKBQyzgDfggCljFm2 RlNUuyLiIPv25Mu4l6eogrdmOjbEPubIDpTQf/W3QQp1o1MYW+Pswla8H0mmK2dwpJ npSCZMENiSkzwLoU0uZcWTrGQfQzi7QS4bLJeKjw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389162AbgAXKGs (ORCPT ); Fri, 24 Jan 2020 05:06:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:43334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730766AbgAXKGs (ORCPT ); Fri, 24 Jan 2020 05:06:48 -0500 Received: from localhost (unknown [145.15.244.15]) (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 D147A206F0; Fri, 24 Jan 2020 10:06:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860407; bh=maeMNMQTEB9QDEHdX6dLnQmt1fBj7Sr6eZDP1VuBc2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z2qaZbYYSS48yxNgYzKf07LIDp+CQeg3Hem9BG7z7Qn1iTPJWafjetrTDb5zW/PG8 x5k1V5rh1apXg5ycXaNMVjV4Uf+acVjFYOVnJcvIn5gYccewc7Hy+hntimePclsBdq jtVndskTEJB0174jgrPuNGJQwILWWRRjCDKSYrgw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Kicinski , Simon Horman , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 328/343] net: netem: correct the parents backlog when corrupted packet was dropped Date: Fri, 24 Jan 2020 10:32:26 +0100 Message-Id: <20200124093002.948209940@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 64c3cfa357363..328b043edf074 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -603,6 +603,8 @@ finish_segs: } /* 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; }