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=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 B2E06C28CC2 for ; Thu, 30 May 2019 04:35:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83DEF257C6 for ; Thu, 30 May 2019 04:35:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559190951; bh=V/AOaJf7WQlhxpyHlSb0eV/TBH8k2t15up+5rVcIvO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=R3ZkZGOnT+hnI0qPVslrrQjB6td1PvL7gI4Uv5C5F/nVEQwAk4Db5+ZaayG0dG39g QfRGWpmvicJWTaOAYUyPBZ0VqvIFElrh6v7jpJwq841/6tRpWsh6USNEvmqX9IrGe+ Sl67D9kwRQtQErwvXOoK8BloiECwr6TQqWC8kSM0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388487AbfE3Efv (ORCPT ); Thu, 30 May 2019 00:35:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:57410 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726382AbfE3DNG (ORCPT ); Wed, 29 May 2019 23:13:06 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 368832449A; Thu, 30 May 2019 03:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559185985; bh=V/AOaJf7WQlhxpyHlSb0eV/TBH8k2t15up+5rVcIvO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iEdSSkunnfnG3jtiIbXxE9iroz5xB/OLoR7HRc61PP5/B0TvFD+qDciiABAyiDf+E Y2dfcsItZXqdNIrUV7BYqv/7GEXF0k3CMYVlE9OCFvzgcT7VfgbBkUDZTjMSz6u6a0 G8tib/apCv6FQEJTToKlj3zCW/+pYDGC0/OjliME= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hante Meuleman , Pieter-Paul Giesberts , Franky Lin , Arend van Spriel , Kalle Valo , Ben Hutchings Subject: [PATCH 5.0 025/346] brcmfmac: assure SSID length from firmware is limited Date: Wed, 29 May 2019 20:01:38 -0700 Message-Id: <20190530030542.015985894@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.363386121@linuxfoundation.org> References: <20190530030540.363386121@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arend van Spriel commit 1b5e2423164b3670e8bc9174e4762d297990deff upstream. The SSID length as received from firmware should not exceed IEEE80211_MAX_SSID_LEN as that would result in heap overflow. Reviewed-by: Hante Meuleman Reviewed-by: Pieter-Paul Giesberts Reviewed-by: Franky Lin Signed-off-by: Arend van Spriel Signed-off-by: Kalle Valo Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -3474,6 +3474,8 @@ brcmf_wowl_nd_results(struct brcmf_if *i } netinfo = brcmf_get_netinfo_array(pfn_result); + if (netinfo->SSID_len > IEEE80211_MAX_SSID_LEN) + netinfo->SSID_len = IEEE80211_MAX_SSID_LEN; memcpy(cfg->wowl.nd->ssid.ssid, netinfo->SSID, netinfo->SSID_len); cfg->wowl.nd->ssid.ssid_len = netinfo->SSID_len; cfg->wowl.nd->n_channels = 1;