Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp2936192ybk; Mon, 18 May 2020 11:31:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSGf1oKL4K5P2E7aOGRznDPKRQLAJ6GoC7gSFBuuz5+Cqbu5pIzi5MVjbnWSDiVoPxiNLn X-Received: by 2002:a17:906:3c4f:: with SMTP id i15mr15767354ejg.243.1589826676312; Mon, 18 May 2020 11:31:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589826676; cv=none; d=google.com; s=arc-20160816; b=yqqgNvdKQi8tWd+qQ4t0xKWu/udVY24fAZgwy/f1SLwAKYVF+llrrvG0Jvcz1ooXzb /fZx/5Mh4AZQkg1/jFngGQhVENHOFy+nUybMAFVv4FCphp42SEignimGDYOq6eVP3B9K //52Sq2xv2hnMTqzHE/yZDhErVomvzS8kT1IutmHrc3HeLsVMNfe+sjSFCEEoM07poTw b6CeK+MJUW1uWuWczxB+NuPDP+HyMYEGROtzRgroj611MS4IBCSSurfrDxFK/FTAgx6n N5+SN34Sgeqh+6Fv3icUjg/RRReAr4tD3smmMeBwi7LDX4Zg20U0vNglCNmXzruabAKB xXMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uXuU/DsosaF+fVdbOWynG2LreGL8wN/ssVWiMiH/Ua4=; b=omv8YerRW4/lyiKcFaUFFFG+WPw2XsG5/fGnNwIArs5i14Qkw8Mc8vD8GQfVkn1nCT 40mutMnO8Laac4Uy+RYXzrLhf6uzY1SeEh4/CfRc9ip3uezly9Rpl1mZgTMw12TYf3AI /dzGpuFyOjTfr3LE5v+yK12+sOkTrIQXQliJ2XF9WmKPWTjFIxkMbO2Rv/0uAcuyxEjD POLaXKFtP2MosFuMtClf8qVevlPkXoeg5tD/aV2X7ToJp8b9CM75L7BQHkgiD6mw7Si0 /TyHG+thPX/2Zf94yOwUiocZ0ALuREQFeTo427nRavxjlZfQ21V8qrnaYomBPQhBl6Fe CH3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PjyqmiU8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f18si6966619ejf.50.2020.05.18.11.30.47; Mon, 18 May 2020 11:31:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PjyqmiU8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730871AbgERS2h (ORCPT + 99 others); Mon, 18 May 2020 14:28:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:39696 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729448AbgERRmg (ORCPT ); Mon, 18 May 2020 13:42:36 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 C868320715; Mon, 18 May 2020 17:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589823756; bh=92C6p6tlwbBMVt5XS+W92fxk5AXDJDTfJrbzkbFQ0D8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PjyqmiU8iJm+kQtk8g2XYxZiqXDlGTOtlN/KEyQHMq5VieT5STm9FL4k6AwLqI6Hv d1aFxYvY7ckmLp7kF4wCQmGFHayK8NZFYLsDQYyV6Mk6pSwDVGuKU0StFZINCi3C2o 17zOftUZPdlfBvj1qpHPC2KasOSN6IyOpl+ZJWX8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , "David S. Miller" Subject: [PATCH 4.9 03/90] fq_codel: fix TCA_FQ_CODEL_DROP_BATCH_SIZE sanity checks Date: Mon, 18 May 2020 19:35:41 +0200 Message-Id: <20200518173451.710909306@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518173450.930655662@linuxfoundation.org> References: <20200518173450.930655662@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet [ Upstream commit 14695212d4cd8b0c997f6121b6df8520038ce076 ] My intent was to not let users set a zero drop_batch_size, it seems I once again messed with min()/max(). Fixes: 9d18562a2278 ("fq_codel: add batch ability to fq_codel_drop()") Signed-off-by: Eric Dumazet Acked-by: Toke Høiland-Jørgensen Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_fq_codel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c @@ -428,7 +428,7 @@ static int fq_codel_change(struct Qdisc q->quantum = max(256U, nla_get_u32(tb[TCA_FQ_CODEL_QUANTUM])); if (tb[TCA_FQ_CODEL_DROP_BATCH_SIZE]) - q->drop_batch_size = min(1U, nla_get_u32(tb[TCA_FQ_CODEL_DROP_BATCH_SIZE])); + q->drop_batch_size = max(1U, nla_get_u32(tb[TCA_FQ_CODEL_DROP_BATCH_SIZE])); if (tb[TCA_FQ_CODEL_MEMORY_LIMIT]) q->memory_limit = min(1U << 31, nla_get_u32(tb[TCA_FQ_CODEL_MEMORY_LIMIT]));