From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1175177-1517178645-2-9510047396455298683 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=1517178644; b=iZ97Y8DH5kH6JHDCXTyirxYBEuRQr1ihr02lNTgmEp0aZQH xkOJsbY92EJsqJ4zf1aTwzw377+pLGbkPnJsCiSEWLvLnV7loWTlbYPBVZyAg8ZD k/axBHmVs1oYqFIremkftVwXfaxEHhqdpMmTET0gd1DzypbhkI8m0sHMYixAcdCu W0DetZdupP/0crax4YszOx3nfgNFkF6kwWmtQWO6hSAyloDnoGaJ0Psrw6/UX8hE BDkF133eZ6v9RgIoN6I6TiQ2KwTEBhTojjZeCd3/w96fEF2wEEW9K00fRi0LkVtn CEcNJ6M/h0uO2yiTQ/yw8Raz5Ui67R55aDL4WxQ== 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=1517178644; bh=XgvfFo /2JweDU4INwCL1A0NgGy3/LsSBqgwZhem3z/w=; b=w/ZckMf4CUvEIwsID+E9i4 MqOa+EJfLHpJwaa2jEMmJOojTLgexvMwGtiL9tbv1kFaqVZ+eCP96ynYBgwf8Nnv paY8sUtKgyuofL0Pyx/g6OMGcDEd7Gw5US7mFkt5CAXjBxCtbQQCHSk/UYsbbOy1 Jhrm69TdrZXoXPOlyU4TyBSNmGsA/YsGQmLE25dWHvcIBdWE1U50qXyxGFeQGwAR oy9JaeyTuJdBCKwGum75zQQwhzFEnBHKGvvc0O5DsxxMSQfxHpZLtJot1XL5+bfN qRsbP7+5lQpBDZU7PywZvtW3PFhbLyZpO4t2A3q1gLy7fSt1jj+lvwtXVvAzVszQ == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=EBqvpQ4L 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: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=EBqvpQ4L 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 S932643AbeA1Wak (ORCPT ); Sun, 28 Jan 2018 17:30:40 -0500 Received: from mail-cys01nam02on0129.outbound.protection.outlook.com ([104.47.37.129]:29515 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932635AbeA1Wai (ORCPT ); Sun, 28 Jan 2018 17:30:38 -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 13/25] net_sched: red: Avoid illegal values Thread-Topic: [PATCH AUTOSEL for 3.18 13/25] net_sched: red: Avoid illegal values Thread-Index: AQHTmIeDeLHixVNBukO5noQSVWnU9g== Date: Sun, 28 Jan 2018 22:29:51 +0000 Message-ID: <20180128222931.7781-13-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:2uolQ/J4E1RXUi6+fCmITuaR4qqZQLv8vFn2/Ed3cn507yFhFxz3+6EoqMq2mJyk5pkIi5dXWFOsEd3zGoN+YpbGS6uzWqDBjIRcpP159mKiAzw/QgpqqzEU9jfXK59Equ2LeqC8uLkbyj+P5Odz1eZSZkREXfwt9eb4JbVzqIsRf3XEYdeMVM4dxZrJvxNlL1OgZv3hVEB2bC40vng013bSs1qZvZl9CmB3F+TAAfiZaShKZcdwNLAdLFxQIk+Z x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 59a62345-6009-4518-65f9-08d5669ebe15 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: 1BnqpYsUQgK9DLfo6cTJdMT6uXzdD0xCMppNkZTOabCEVabxHigBgTUaIfx8OCtJYeFG1olcLEsOxts4KGlYbA== 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: 59a62345-6009-4518-65f9-08d5669ebe15 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:29:51.7094 (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 8afa10cbe281b10371fee5a87ab266e48d71a7f9 ] Check the qmin & qmax values doesn't overflow for the given Wlog value. Check that qmin <=3D qmax. Fixes: a783474591f2 ("[PKT_SCHED]: Generic RED layer") Signed-off-by: Nogah Frankel Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- include/net/red.h | 11 +++++++++++ net/sched/sch_choke.c | 3 +++ net/sched/sch_gred.c | 3 +++ net/sched/sch_red.c | 2 ++ net/sched/sch_sfq.c | 3 +++ 5 files changed, 22 insertions(+) diff --git a/include/net/red.h b/include/net/red.h index ba5039418a93..3618cdfec884 100644 --- a/include/net/red.h +++ b/include/net/red.h @@ -167,6 +167,17 @@ static inline void red_set_vars(struct red_vars *v) v->qcount =3D -1; } =20 +static inline bool red_check_params(u32 qth_min, u32 qth_max, u8 Wlog) +{ + if (fls(qth_min) + Wlog > 32) + return false; + if (fls(qth_max) + Wlog > 32) + return false; + if (qth_max < qth_min) + return false; + return true; +} + static inline void red_set_parms(struct red_parms *p, u32 qth_min, u32 qth_max, u8 Wlog, u8 Plog, u8 Scell_log, u8 *stab, u32 max_P) diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c index 3f6437db9b0f..ec11aced121d 100644 --- a/net/sched/sch_choke.c +++ b/net/sched/sch_choke.c @@ -431,6 +431,9 @@ static int choke_change(struct Qdisc *sch, struct nlatt= r *opt) =20 ctl =3D nla_data(tb[TCA_CHOKE_PARMS]); =20 + if (!red_check_params(ctl->qth_min, ctl->qth_max, ctl->Wlog)) + return -EINVAL; + if (ctl->limit > CHOKE_MAX_QUEUE) return -EINVAL; =20 diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index a4ca4517cdc8..5d004ecdbefd 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c @@ -388,6 +388,9 @@ static inline int gred_change_vq(struct Qdisc *sch, int= dp, struct gred_sched *table =3D qdisc_priv(sch); struct gred_sched_data *q =3D table->tab[dp]; =20 + if (!red_check_params(ctl->qth_min, ctl->qth_max, ctl->Wlog)) + return -EINVAL; + if (!q) { table->tab[dp] =3D q =3D *prealloc; *prealloc =3D NULL; diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index 8c0508c0e287..0505b8408c8b 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c @@ -199,6 +199,8 @@ static int red_change(struct Qdisc *sch, struct nlattr = *opt) max_P =3D tb[TCA_RED_MAX_P] ? nla_get_u32(tb[TCA_RED_MAX_P]) : 0; =20 ctl =3D nla_data(tb[TCA_RED_PARMS]); + if (!red_check_params(ctl->qth_min, ctl->qth_max, ctl->Wlog)) + return -EINVAL; =20 if (ctl->limit > 0) { child =3D fifo_create_dflt(sch, &bfifo_qdisc_ops, ctl->limit); diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index 4417fb25166f..093f55d0a19a 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c @@ -653,6 +653,9 @@ static int sfq_change(struct Qdisc *sch, struct nlattr = *opt) if (ctl->divisor && (!is_power_of_2(ctl->divisor) || ctl->divisor > 65536)) return -EINVAL; + if (ctl_v1 && !red_check_params(ctl_v1->qth_min, ctl_v1->qth_max, + ctl_v1->Wlog)) + return -EINVAL; if (ctl_v1 && ctl_v1->qth_min) { p =3D kmalloc(sizeof(*p), GFP_KERNEL); if (!p) --=20 2.11.0