Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3033534ybt; Mon, 29 Jun 2020 13:27:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJze2Ge798F/ucRALTx83W+Ngsp/KO6X0B5CyAxuoz9UmzGNWTG074Y5H85MmAmhGqOfx1e2 X-Received: by 2002:a17:906:95c2:: with SMTP id n2mr14854957ejy.339.1593462473392; Mon, 29 Jun 2020 13:27:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593462473; cv=none; d=google.com; s=arc-20160816; b=qZy6dyOe/4Ulpy4nIP+8EFaNUhL+bP8Px+ftXGyZSriSydifz5Xi1q/JBxHIl3Rxje UbgJAzIPS9mNjQyGuezdnC07BPmvitg/M0m0AMh/iSx5nATZVd221ygQRgEnOeQkrDab OOYP3wnXGjgdx5+Bl7AxYh5001CEQDt19A87vtZUjocus24eqRDKn9iUvhv4yH2jcCSA kivJHFEAJXVMd5smiIuPi+sZab+KsJo9o9JtB2Z6VKpYGjF3+jq1jbc+M0C1mWbbKzPU 8I3yYA+yrERjjWZiNy1jh/ycswkL4f2wiJAkPk2AQudY9VWNy+g4ffeJV61nKJqFpYpb 0ssQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=D3JDk7bRfxxRw0AecxnF/8QsakQw3dlHjdO4c1exs2s=; b=txbxXkHCpOBiEeOECPQGhGXR6BOJzCosqQSNd72qFeRtkzGjdpNkAQTt4XEuTVO/l8 uOPTnGVhHybkSLa16XHaqNUeI2PlVFzyAX8lo7p8vi5671rQlzH50li8R7+ax+su9YhK /1bYH6Jk928pF6m60bLk8B1/5+DE95aT5oxmNiBACUR4Juw1DzIl2qimvTe8/lAGAudG xslv6HIrtkMPT/KRFfHIK7HuF4nzmeK8ipQvOBmSYjUSKLP2eW07G9ZrkWlgw0XTT1DZ RgXcPX0qnkkd5hsPAshE2Mt5hxSa0BNNQKrF21P7T6gy0ggasI+oKJGwrsbZ82GI2+Og wM4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=J2NTubYY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z14si344903edl.500.2020.06.29.13.27.30; Mon, 29 Jun 2020 13:27:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=J2NTubYY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388898AbgF2UX7 (ORCPT + 99 others); Mon, 29 Jun 2020 16:23:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:37044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732561AbgF2TZb (ORCPT ); Mon, 29 Jun 2020 15:25:31 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 570702533B; Mon, 29 Jun 2020 15:39:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445179; bh=4ZO3tFXObaGfCPX+bWEYa6pc6iCg3U9UGNYrABAuf1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J2NTubYYF830biPVa+KlzxnAoURunxts8D1x5LFUuY0kjfjZ8LegdNOheperPDNFU uxevVxwQ44XxNks75KJRVscmLO1UFnoVpiYDQkIUJt2Gti2QkKMglKIfseQ+dA2JpM vJO298x9alzKNak8KZDUMIRhZp/HG3/OYg4yfHM8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Greg Kroah-Hartman Subject: [PATCH 4.14 71/78] Staging: rtl8723bs: prevent buffer overflow in update_sta_support_rate() Date: Mon, 29 Jun 2020 11:37:59 -0400 Message-Id: <20200629153806.2494953-72-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629153806.2494953-1-sashal@kernel.org> References: <20200629153806.2494953-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.186-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.14.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.14.186-rc1 X-KernelTest-Deadline: 2020-07-01T15:38+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter commit b65a2d8c8614386f7e8d38ea150749f8a862f431 upstream. The "ie_len" variable is in the 0-255 range and it comes from the network. If it's over NDIS_802_11_LENGTH_RATES_EX (16) then that will lead to memory corruption. Fixes: 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver") Signed-off-by: Dan Carpenter Cc: stable Link: https://lore.kernel.org/r/20200603101958.GA1845750@mwanda Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c index f485f541e36d0..d6de62ee681e5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -1904,12 +1904,14 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_l pIE = (struct ndis_80211_var_ie *)rtw_get_ie(pvar_ie, _SUPPORTEDRATES_IE_, &ie_len, var_ie_len); if (pIE == NULL) return _FAIL; + if (ie_len > sizeof(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates)) + return _FAIL; memcpy(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, pIE->data, ie_len); supportRateNum = ie_len; pIE = (struct ndis_80211_var_ie *)rtw_get_ie(pvar_ie, _EXT_SUPPORTEDRATES_IE_, &ie_len, var_ie_len); - if (pIE) + if (pIE && (ie_len <= sizeof(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates) - supportRateNum)) memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len); return _SUCCESS; -- 2.25.1