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 05B23C433F4 for ; Mon, 24 Sep 2018 14:59:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7E752087A for ; Mon, 24 Sep 2018 14:59:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microsoft.com header.i=@microsoft.com header.b="B2/0gG0X" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7E752087A 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 S2387949AbeIXUwV (ORCPT ); Mon, 24 Sep 2018 16:52:21 -0400 Received: from mail-by2nam03on0127.outbound.protection.outlook.com ([104.47.42.127]:17577 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387902AbeIXUwU (ORCPT ); Mon, 24 Sep 2018 16:52:20 -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=b3Og96iqisnFLIImRJLFkymUdr2wx32RYq/x7Fwqx74=; b=B2/0gG0Xv3t/qSnfqtoT/5FgE6emmT9IGBUl+0G3auKOjcyO6ZNQ69Xt4JSGt1f0mQpkhON9wTSRttAWZjiq1SFxkEDw55+hT9Iog6KprENags9Bql9b/4CGsiN/+Vs7jgFin1WrwdtYuORqdIqrgRSOZtJ3dqCRDgdhjDWACt4= 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:49:44 +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:49:44 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Arunk Khandavalli , Jouni Malinen , Johannes Berg , Sasha Levin Subject: [PATCH AUTOSEL 4.14 15/36] cfg80211: nl80211_update_ft_ies() to validate NL80211_ATTR_IE Thread-Topic: [PATCH AUTOSEL 4.14 15/36] cfg80211: nl80211_update_ft_ies() to validate NL80211_ATTR_IE Thread-Index: AQHUVBW8bnIH6ibvH0q1AmsGJrOV/Q== Date: Mon, 24 Sep 2018 14:49:02 +0000 Message-ID: <20180924144851.164533-15-alexander.levin@microsoft.com> References: <20180924144851.164533-1-alexander.levin@microsoft.com> In-Reply-To: <20180924144851.164533-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:5yIjzhgumSEFg6wPuP/BqVIlRPrmOaq9YefGCAtQnGr8DL43ynOVcApWYUmSZLQ2WuU3R2eANvZKrWYlauHeW/Dsop0vTiTiyweh77Buk/zF89rVNxiYrr5KIIwb2isMo72TV8Mjw/G5GzN4JC0x04e5eS1laQgpdn23dYEHmZe+APe7HnBK6xLtLctJAteRXy5S+AKTKneS+2V2xk8vdWFng+TT+stkFcK00MdAMwgyPXPLXMF3o8DUNZDg7jI/0E3OnwHOcgUdE71gmWFrdO4jwIwy8v9Vhgsg2fnOcteVvjWTcbgK9pRUvDT2bd2JQdEy+p5pY/Mna69KDIn9d2xEAPBQv+sJlJdo9Hu0AXfeiafv2V1NW79q7oxFIY/Dt5SFwU+xcMdlUcaMyG/vwwHiPBpI5NdpLfFIFX7k0o+RteELxSVeOZG/ePWAx3q/8/DKkdFQEqxXm6MLMHcRxg==;5:8rqK+4hTPJzP0L/rVR93z9QQxurME2lSdSwN7gNMaUK1lEPah41qTbOvWNrXE5V+MGqNTaLwsklstYSuuHm6xGw7z/BVG2eHLGfhecf6ek8nyat6fjaV4acodXggLPykyYtYE9PM8lx5PEJWwpW8hu8hJkOvG8mEHhVy+UooOXY=;7:E/RBChCx1mvKAmNfIU9rAjCMOGX1nJDgY+cipLx7TxzeIk29FbH9Iq0ZN/rQ1OXvSTmzhxaKHloAkfELEl0G6z3/qQehizrsQx7MTOpeU6lAif9D3W6Y6zPlKUODXYLiIB72rLGpKt7+OcycEGDDzVpwRf5U4iKEUWF14AMje2h+dmaRFbjz89FLDOZ6J8xtUJQuwSq0qYcig2EvZMWHosrpUqMqjatdTdRY+HfHLsaOv6G76GJEcRV3NQswlDz/ x-ms-office365-filtering-correlation-id: 90439424-5f06-4858-9955-08d6222cf77f 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:(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)(10290500003)(6116002)(26005)(102836004)(3846002)(5660300001)(22452003)(110136005)(10090500001)(8676002)(15650500001)(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: ZrirUfPj1VlP878zOJcv2HNWwocZg4kexTx5YcdME5kXwgis/EyYrOLMpCPttfJhj6V6i7bh9lU+m0wOiOsp+04tVvx/fOcg4SInsQIwI82PUTW184ywPBigj2MveN2AWQqGRgd/wiwFSNM3kWTI/SKkarykumTyvNAXOhXLjClxo/I33gGwM4ASh8DPAKu2mvgZmXXS2vHLulIM/0JZEBvjQiEvojfqbBVuHrjYD1AoGS9lwbNzxP5XHiVIcMEhEYAKzWdxkaZMX1NGGECsDp6/bCVajk0XpGX23Ax+aBAt8BZN+hXIqDic6fd/jjHGTFzPT2D4xwPEhlyGn/TKL0mKzCT+RXYZ16M4i4NP4OE= 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: 90439424-5f06-4858-9955-08d6222cf77f X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2018 14:49:02.6788 (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: Arunk Khandavalli [ Upstream commit 4f0223bfe9c3e62d8f45a85f1ef1b18a8a263ef9 ] nl80211_update_ft_ies() tried to validate NL80211_ATTR_IE with is_valid_ie_attr() before dereferencing it, but that helper function returns true in case of NULL pointer (i.e., attribute not included). This can result to dereferencing a NULL pointer. Fix that by explicitly checking that NL80211_ATTR_IE is included. Fixes: 355199e02b83 ("cfg80211: Extend support for IEEE 802.11r Fast BSS Tr= ansition") Signed-off-by: Arunk Khandavalli Signed-off-by: Jouni Malinen Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 753f3e73c498..3de415bca391 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -11679,6 +11679,7 @@ static int nl80211_update_ft_ies(struct sk_buff *sk= b, struct genl_info *info) return -EOPNOTSUPP; =20 if (!info->attrs[NL80211_ATTR_MDID] || + !info->attrs[NL80211_ATTR_IE] || !is_valid_ie_attr(info->attrs[NL80211_ATTR_IE])) return -EINVAL; =20 --=20 2.17.1