From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517178885-2-514411739845555327 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517178885; b=c8H8aWHtx5iVoLaCM33qH8iMnGF/lPh5haIY0lOT6nUXV5r B1sBt+IiuQ4RQpbEhKJnw5Xe9LIJyl9GnNyQMulZBSluw84XpCjkbarHRwCcNRp0 F+iqB6/Hs9yJomCzbZ9fjFLLTjfzQuYm/li3By8r/yjWagvh13zpAOxnWXN+vb3U lKYe7ww5HqWg/KtpyiRW07A6R048EKMBpqv0gyIuPMLIzSfQw0Ilh6Z8jnCQOeet TqfTjZVXahGx1ytXwjDv6WcSMzS/VQ+zmF0gLVHPSJeZydiRBY07yiQybkxGeuAg xjUiLIJQS7/mul6B3pgVr2ZvS94hxD6U4Zb2UPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517178885; bh=WfoaEM DMGLOD9pzNi4c5CtzSYDfF/E7BHoAc8Irnawg=; b=CjhxuwFIQADVQ2vMH4Ac2j sdB9SVmqKE801ySoUAgpXuEriY/Rb6oi4VsbC6lj9RISJcH32aRPeQNQakPxlrBf ppVoJ/zoakI7rZYOJRd4mrn5oM25Khgh3x/4XsYLi/7WhwvDiHSi9zcnID416ZFY JOEYojieaF93GzRPjhRmxbILwoy2ZmI5n0DOGrKoqOaWeCLWGL3LWXzbmX8DAi6m JgWG/W4p/Q0+uJN2PSV62gQFkUxV42wFNcgA2V8mjwTqyTsw20EcGDgcqkFoNhSN QiRnS2gAyhgIkzKhKzFpvcSXOWUKhz11/tmra4cRSvcmIu8i0AZ3dZvzbfIvV0ZA == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ehiEEr2j x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ehiEEr2j x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932831AbeA1Wem (ORCPT ); Sun, 28 Jan 2018 17:34:42 -0500 Received: from mail-bl2nam02on0093.outbound.protection.outlook.com ([104.47.38.93]:45074 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932199AbeA1Wah (ORCPT ); Sun, 28 Jan 2018 17:30:37 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Nogah Frankel , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 12/25] net_sched: red: Avoid devision by zero Thread-Topic: [PATCH AUTOSEL for 3.18 12/25] net_sched: red: Avoid devision by zero Thread-Index: AQHTmIeCYD8QDfcOJUWqq2InSpqauA== Date: Sun, 28 Jan 2018 22:29:49 +0000 Message-ID: <20180128222931.7781-12-alexander.levin@microsoft.com> References: <20180128222931.7781-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222931.7781-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1098;7:PO6zX5Z9pCRS0TvlMMwAK0mBE15fK3z30JPhYS8no4zwJucy7ckldtctpZMSfVZ10e1w4pbV9SJsCw2e0GHXSDA+hdn4evle5RMwhZSDeOb+SlEqMKDb2TtlUzAwKm5hOoZ8KJfXqZRb2sc+UFkExLdDmYWF5yFf030OI5w94LQSTFz6upeT9JFAHstcUhVfF3S/Esd26qmHNxULyN9yJnRW+eXMO7AOm+08MZTHRcsq7GRvUaYChMyMpmTw0ZpS x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: f01066aa-d3da-4e32-1f4a-08d5669ebdde x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1098; x-ms-traffictypediagnostic: MW2PR2101MB1098: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1098;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1098; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(346002)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(54906003)(7736002)(66066001)(305945005)(316002)(72206003)(106356001)(2950100002)(6666003)(478600001)(10290500003)(6506007)(97736004)(2906002)(105586002)(59450400001)(25786009)(107886003)(5250100002)(8676002)(110136005)(14454004)(5660300001)(2501003)(22452003)(2900100001)(81156014)(68736007)(6436002)(8936002)(53936002)(10090500001)(81166006)(99286004)(102836004)(3660700001)(36756003)(3280700002)(86612001)(575784001)(3846002)(6116002)(86362001)(1076002)(4326008)(26005)(76176011)(6512007)(6486002)(186003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1098;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: nN2HQ1GYZ8qaGUXiec19tCIBDNI144OyOkloKlMzRpv80JxxP50kX7MytVSjytw+v/AfHnhJuBJaU2GACDCcrw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f01066aa-d3da-4e32-1f4a-08d5669ebdde X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:29:50.0102 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1098 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Nogah Frankel [ Upstream commit 5c472203421ab4f928aa1ae9e1dbcfdd80324148 ] Do not allow delta value to be zero since it is used as a divisor. Fixes: 8af2a218de38 ("sch_red: Adaptative RED AQM") Signed-off-by: Nogah Frankel Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- include/net/red.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/red.h b/include/net/red.h index 76e0b5f922c6..ba5039418a93 100644 --- a/include/net/red.h +++ b/include/net/red.h @@ -178,7 +178,7 @@ static inline void red_set_parms(struct red_parms *p, p->qth_max =3D qth_max << Wlog; p->Wlog =3D Wlog; p->Plog =3D Plog; - if (delta < 0) + if (delta <=3D 0) delta =3D 1; p->qth_delta =3D delta; if (!max_P) { --=20 2.11.0