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=-7.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 09223ECE561 for ; Mon, 24 Sep 2018 14:54:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ADCC62087A for ; Mon, 24 Sep 2018 14:54:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microsoft.com header.i=@microsoft.com header.b="fQ+d8EAd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ADCC62087A Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=microsoft.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389037AbeIXUx5 (ORCPT ); Mon, 24 Sep 2018 16:53:57 -0400 Received: from mail-by2nam03on0111.outbound.protection.outlook.com ([104.47.42.111]:32743 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388985AbeIXUxx (ORCPT ); Mon, 24 Sep 2018 16:53:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ip4ino16aT6mUf9rNPvPbEkt88f7qck5/Z6YC09bCvI=; b=fQ+d8EAdFlO7457M2JhJgSSxoUYucghKIpPaD79WffMJ0xALoiJuTeKSVhZp/SsQ2tawkDtZ+imJaUXvLT+SYjUoDy0p52s2oRW21ywWQiztq0EO7xVaYKCb1P3lmCV2qk0fpEO3tKI/C/zzfK99G52vI78jhoOnr6gFcK03a3A= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0181.namprd21.prod.outlook.com (10.173.193.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.3; Mon, 24 Sep 2018 14:51:01 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36%5]) with mapi id 15.20.1207.003; Mon, 24 Sep 2018 14:51:01 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Dan Carpenter , Johannes Berg , Sasha Levin Subject: [PATCH AUTOSEL 4.9 17/23] cfg80211: fix a type issue in ieee80211_chandef_to_operating_class() Thread-Topic: [PATCH AUTOSEL 4.9 17/23] cfg80211: fix a type issue in ieee80211_chandef_to_operating_class() Thread-Index: AQHUVBXOq7azPHwNEUysktTOH6lbDg== Date: Mon, 24 Sep 2018 14:49:33 +0000 Message-ID: <20180924144919.164617-17-alexander.levin@microsoft.com> References: <20180924144919.164617-1-alexander.levin@microsoft.com> In-Reply-To: <20180924144919.164617-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;CY4PR21MB0181;6:P7q9/GrWBCvy7N3f8p8BQhT+gLlVYordQ80jezCbUHnsaV2ZxmzEi1P6+l82Uho7Y/tF3LlMLP5NAq4uCvdJ7rysvzXZnB1DPeI6zKcxpXo+GUQ4GGLvxYP52V6AQ3tw3HlTePo/OcAExFaRsnoMQnnQPh2AzJ8Hq3KDPbHSrmIJhwJxaL5Z6edUusxJ9RI0k2KibAq1Oxwkk2yN2h78ZLxJtC356sISKlGkG2ojHRB9gHtxHYybZutQaIfxq/mfI3C/2ifQ7r9UDawUO5OOQdJ1CWhWK9UxkK5uWkvUBPd6ZykRjTHGXS/GUAHruQhXQImvE5QsDXnMG89FADnrOQBbSNbmY0AcbpG23OoOaFThm6kTqupFXwJ3tcJQdq8pRCBUMM8SJizWe+2QSFlJMpvrwmMZJ6Q4sDtFQztaYMSmsltldkMzr2/SQtDnBcoY/82A2kHPVrwgwa+4daeN4Q==;5:Bbx8T38vvWX5/tf0xzUkUaoIpaBCOJyke7EvQG1TSDDdHMeiXWpfCK8yd59Aafe84tLHawWTySpnVpkZz+H6AdYSlqC9QfyU36nIO2Hewp7FHKIVMzMTwpVZa5HP9uBs6wW2SPBu1IJTv8EX4cIUCJ/kWK50aFtUQeqGwY/qAnY=;7:lrEXz7h48U5W4r6MQQZ8aTBD7v6siE0a4vCC7Gpb+oBDDPNYQacZLy/LsUrsaFanP9ryBKVo6NVUNvsI7xmSCjZGBvShD7E2l5cJF81AV8cGvorziZAI2mUgzwtZd2P9BAxVkvHpGD0RZzFoHHG5PqMRZ8TxE2cewzcz+pUKqZ0J+qQgmwQfCxSdmmBYwPZxTbFSlv4rn0hyTdU3oyfXn8ZP7pH30YtlVzz7jM1/y6gppzC/TEgGxDHl4s7xUNQ4 x-ms-office365-filtering-correlation-id: fb161d83-8eb9-483d-dec1-08d6222d2596 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);SRVR:CY4PR21MB0181; x-ms-traffictypediagnostic: CY4PR21MB0181: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(146099531331640)(228905959029699)(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231355)(944501410)(52105095)(2018427008)(10201501046)(93006095)(93001095)(3002001)(6055026)(149066)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201708071742011)(7699051)(76991041);SRVR:CY4PR21MB0181;BCL:0;PCL:0;RULEID:;SRVR:CY4PR21MB0181; x-forefront-prvs: 0805EC9467 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(376002)(39860400002)(136003)(346002)(396003)(189003)(199004)(575784001)(10290500003)(6116002)(26005)(102836004)(3846002)(5660300001)(22452003)(110136005)(10090500001)(8676002)(1076002)(54906003)(105586002)(186003)(316002)(106356001)(2501003)(6436002)(97736004)(6486002)(107886003)(7736002)(36756003)(478600001)(72206003)(14454004)(71200400001)(71190400001)(305945005)(256004)(14444005)(5250100002)(217873002)(6666003)(2616005)(68736007)(53936002)(81166006)(81156014)(2900100001)(476003)(86612001)(15760500003)(4326008)(8936002)(486006)(99286004)(6512007)(86362001)(2906002)(25786009)(66066001)(6506007)(11346002)(446003)(76176011);DIR:OUT;SFP:1102;SCL:1;SRVR:CY4PR21MB0181;H:CY4PR21MB0776.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: dlXyna0kLsmR6w+QBztR0tiNmqfwRcwvP1fbq3AWveTtFyeJFCQZN8u38/2cLxi96zOvAOi+8yLuk4zBj7agCdKVdnftOYcIOho+17YgPrb8BwRcJxj5aK7Meokco4N0RZ8BI9rnGdolag6eS08PFZzgBubIKlZ8lYLZA++wa94hJWc3sBfhX5NS8+WGzNAIczVzX7csb8MlRopOu3m7gDYQoLETkmliZezmODCXWfC64gTpeHhyl25vTCqD/6awutfhDk1hDD5K1PQAAUy+r66Xbam/UWzjC4kuHtfXVV8913EtVuaJDapkV3v+hUR0/0kQqHVwSGSqoKcMlhVLLyuHavLmEsG1M5d0WaDmHxs= 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: fb161d83-8eb9-483d-dec1-08d6222d2596 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2018 14:49:33.3951 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0181 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit 8442938c3a2177ba16043b3a935f2c78266ad399 ] The "chandef->center_freq1" variable is a u32 but "freq" is a u16 so we are truncating away the high bits. I noticed this bug because in commit 9cf0a0b4b64a ("cfg80211: Add support for 60GHz band channels 5 and 6") we made "freq <=3D 56160 + 2160 * 6" a valid requency when before it was only "freq <=3D 56160 + 2160 * 4" that was valid. It introduces a static checker warning: net/wireless/util.c:1571 ieee80211_chandef_to_operating_class() warn: always true condition '(freq <=3D 56160 + 2160 * 6) =3D> (0-u16ma= x <=3D 69120)' But really we probably shouldn't have been truncating the high bits away to begin with. Signed-off-by: Dan Carpenter Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/wireless/util.c b/net/wireless/util.c index bb54d9db82df..3b9a81998014 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1432,7 +1432,7 @@ bool ieee80211_chandef_to_operating_class(struct cfg8= 0211_chan_def *chandef, u8 *op_class) { u8 vht_opclass; - u16 freq =3D chandef->center_freq1; + u32 freq =3D chandef->center_freq1; =20 if (freq >=3D 2412 && freq <=3D 2472) { if (chandef->width > NL80211_CHAN_WIDTH_40) --=20 2.17.1