From patchwork Thu Oct 13 17:52:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2131 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp404590wrs; Thu, 13 Oct 2022 10:55:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6CkPzrHuSHdqOeimYVCeekQMzgIYLtc9iAozV7WWm4Xyu3Ld29CEaQ7voc5VWsPZGD26bu X-Received: by 2002:a63:4845:0:b0:460:1693:acff with SMTP id x5-20020a634845000000b004601693acffmr945430pgk.538.1665683725433; Thu, 13 Oct 2022 10:55:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665683725; cv=none; d=google.com; s=arc-20160816; b=AK8yQjsEOX88P18Z+BUeBzffWUu9N/5NJ99fjMt8NjY7gNSx+zjauki+z7Vm8nN+I2 tWgvmIHZd8f/cXiyw008FG9pvlPTFT38xOUckmdmvz8y5SCpQzuPEgrTspMPTGCPJl26 2IcEMO5Jlm1fUfNKh5BOUjNPnRZ+KrjVdJJ9T662pDZgIeBgYQY2UN7Q+g5dG8sDoSGH K4JP4zuq8P1QSi3vQRie9e314ch8bshNzvEMTKfACKPo5YIImo+A8BHSE5SZ6kPOsmPD noG4n8vvZNSJ39SSdfvzTOZiM62864y5Gjorqi5nWVvVR6aywOlePAhhzKfNu0rZ9WVs Kekg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=F+KBAGFogf7h2JpyLsv9wGl5XV/SZosChGwhb3r5pjI=; b=HEh8FPdvChEeBV1RjImfg87xJJwTlZ7k18ya6j8+flK6m2keFXIdEOhGq1wXXUutsg t3555P+/0chfMwZ4tKB8PSAH2g3G0J3HvtQ7JuznSfwZeNvUamyx84d69dnTMWYunC3d luJM/SrbbgWbuae7d8hPDE8XpSFkrXS5SVruSdgga6ZX3ADkBqvc5GS2064T2yk79kUA 7vrk8+Wxas+pOEEo8gcn4HaZ62QvXoxZFLnYsC+SwVyU+PtxChz9TqRMYKk9YOJhRF/m j0Mq8RxTuL7DP5IslyzXgBCk0vScRnFRsOMqMZsypce/vXZovPU/jhi/6miqvd4MGIH0 en5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=v2+3Zs1I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r19-20020a63ce53000000b0043c1cb75c22si32613pgi.333.2022.10.13.10.55.11; Thu, 13 Oct 2022 10:55:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=v2+3Zs1I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229967AbiJMRyy (ORCPT + 99 others); Thu, 13 Oct 2022 13:54:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229957AbiJMRyO (ORCPT ); Thu, 13 Oct 2022 13:54:14 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B9511578A7; Thu, 13 Oct 2022 10:53:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4BB0F618F4; Thu, 13 Oct 2022 17:53:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A779C433C1; Thu, 13 Oct 2022 17:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683621; bh=dJKQV479mGlFMVR1hzi8I2tjgh9+4htqItrDF5VQ4ek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v2+3Zs1IkmC1nJT4fgWWe9u1oeoahODz34pUpCO0c6yqVHhdr2I0+LS2WwraeaQfD OyN2fJWu398ydWVLFc5Me9cE264SGl/DX1znOyHXHn7n3hs1Vyiea2el5g1kOVGYhA SLCacRSOBqgEn5doFm3ZnMQqmwN+pGFnNxOCop7Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kees Cook , Johannes Berg Subject: [PATCH 5.4 31/38] wifi: cfg80211/mac80211: reject bad MBSSID elements Date: Thu, 13 Oct 2022 19:52:32 +0200 Message-Id: <20221013175145.279415764@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175144.245431424@linuxfoundation.org> References: <20221013175144.245431424@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746595978286225202?= X-GMAIL-MSGID: =?utf-8?q?1746595978286225202?= From: Johannes Berg commit 8f033d2becc24aa6bfd2a5c104407963560caabc upstream. Per spec, the maximum value for the MaxBSSID ('n') indicator is 8, and the minimum is 1 since a multiple BSSID set with just one BSSID doesn't make sense (the # of BSSIDs is limited by 2^n). Limit this in the parsing in both cfg80211 and mac80211, rejecting any elements with an invalid value. This fixes potentially bad shifts in the processing of these inside the cfg80211_gen_new_bssid() function later. I found this during the investigation of CVE-2022-41674 fixed by the previous patch. Fixes: 0b8fb8235be8 ("cfg80211: Parsing of Multiple BSSID information in scanning") Fixes: 78ac51f81532 ("mac80211: support multi-bssid") Reviewed-by: Kees Cook Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/util.c | 2 ++ net/wireless/scan.c | 2 ++ 2 files changed, 4 insertions(+) --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1289,6 +1289,8 @@ static size_t ieee802_11_find_bssid_prof for_each_element_id(elem, WLAN_EID_MULTIPLE_BSSID, start, len) { if (elem->datalen < 2) continue; + if (elem->data[0] < 1 || elem->data[0] > 8) + continue; for_each_element(sub, elem->data + 1, elem->datalen - 1) { u8 new_bssid[ETH_ALEN]; --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -1582,6 +1582,8 @@ static void cfg80211_parse_mbssid_data(s for_each_element_id(elem, WLAN_EID_MULTIPLE_BSSID, ie, ielen) { if (elem->datalen < 4) continue; + if (elem->data[0] < 1 || (int)elem->data[0] > 8) + continue; for_each_element(sub, elem->data + 1, elem->datalen - 1) { u8 profile_len;