Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3024909ybt; Mon, 29 Jun 2020 13:13:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxyjeSEH4YxUAE2qPMM2AWj1updbaBbrn9RMdeHAVJeQBgeeepr8lWwa5IPCWbJCJOH0h3 X-Received: by 2002:a17:906:b888:: with SMTP id hb8mr15275182ejb.124.1593461592141; Mon, 29 Jun 2020 13:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593461592; cv=none; d=google.com; s=arc-20160816; b=DXjDpwwRQvLksk2s83Cx8w8rMFxl4/OBYeAH5lT0pA/ncKXSS+ZsxhJ2cc2z4PMkiT ZSVs2SwT2V6vNu+DqCxiPbq301fC3fKfbi7db6cVhSYQ1oL0/pCe/eiVbtrhM3owNJir KDfWQl4Hk9nagEW5hkJ/dg66HLmSKlI3lCn+vy8QtdkotrIfNyPOHcq44t1r5RNyVcTa W6i36pccSikbkMbv3uziWPB55RsKZfgJXdQMYRVujkM57sosTAN6Vei4+ezlv61g0T55 8WghwozPlKQVSQHZtWOtkAXYvCoEX4ptguuUkyGWvJ7KBz9tBG05Pdq4b2iRQ9F7J0WQ XzZQ== 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=xTziGrOLVcsQz5ZrZcs4hjXbrq3dCTCyUUq11hYEVB4=; b=OL6hCA97IZwZxC79ayiGfRKmdEkRKg6lmRG0TuuslPKV+Ucy064bg06K3KrW3x0sD/ BsHXJnZS6p/Q/SCeK7VF24C27/k2RUJ69i4Lrr4frrGbjmuBURV0GoXsveAy0+em0eLB q/agSWN/pYMS+Z6CoO1bfgEWT2S8Pc1XTiVxTkem3W9TZ8vxzmNE5t1ZDn8bn2P4RTVJ wPFL72sV5K/PBpIGrFsjgbeu5/KmEmDZDqhSIvwjIxI/FaxQx/QVgNbBMfeQvxY76iyI eN/1f3DbdD9N+royCVabZptKep+8z3m5hQocyAoVPSd2zH8UGcZ80naJCb1X2LEI8FW6 PUhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tYC1augF; 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 c3si312661edr.308.2020.06.29.13.12.49; Mon, 29 Jun 2020 13:13:12 -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=tYC1augF; 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 S1728001AbgF2UJt (ORCPT + 99 others); Mon, 29 Jun 2020 16:09:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:40600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732915AbgF2TaW (ORCPT ); Mon, 29 Jun 2020 15:30:22 -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 599A5252B4; Mon, 29 Jun 2020 15:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445025; bh=rgjFd7XLbY3wbJEkO8jXFp/dzki2gWM5Ij7g6djwNOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tYC1augFz9mWbntBqcjtJW5JMOYBEFWygauOP/tk56JC8qqSbtASXGzNSaLXGgRsV h2E9GvFei3nplB5l0Py5XdOhLKe/pUTVImdu6jC2V1FM4cyvQl7dvYYo1K7OT+mZNk S5RbqW6qu5cP+Z6APIev9YBLWGRXWRecQXqekHEE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Greg Kroah-Hartman Subject: [PATCH 4.19 123/131] Staging: rtl8723bs: prevent buffer overflow in update_sta_support_rate() Date: Mon, 29 Jun 2020 11:34:54 -0400 Message-Id: <20200629153502.2494656-124-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629153502.2494656-1-sashal@kernel.org> References: <20200629153502.2494656-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.131-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.19.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.19.131-rc1 X-KernelTest-Deadline: 2020-07-01T15:34+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 2c65af319a604..6c6bf03ac38aa 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -1856,12 +1856,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) 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