From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6DD346B5 for ; Wed, 15 Jul 2026 00:47:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784076434; cv=none; b=jszrgZEXsbMWZ0dA2CkgqThp6VANw7mYDBuvc3ruUKmuGAkmQTPEs8nhbDvgpqbu6APlO+q1WIOiA9rIqBSAefmKrqKRKBVH54oSd9YNqPSuSNj1U99q9CdkYi/3MTtwtbSC5Z73w3Ctfdf6yTFRGDzq9fYrwQypGVlboPJdSC8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784076434; c=relaxed/simple; bh=wqN1s4n6uArd5qz/pbDBxQpcq7/RjRKHabr75Cfkzn4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dpAe+sYSMNQ8B51AEcohGXzidK3GLllhetsvb5dmM3YqrLnu0Ll0U0W+EUEo0CeO+2zQ7ImJHxwlFvvtSaR9FMiPo4baOinNj+Am8ygy9OcT9756bv6NvU+tdL8aiA5gsqdMPBH+Hy1fqr3qxG1hp1y9KKUVDDVs4MFKZVWlzrA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DChh8tzQ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DChh8tzQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 065E01F00A3D; Wed, 15 Jul 2026 00:47:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784076429; bh=5e+v4LgjzJ2TXfEp1HVmfkAd2uTfms4ipgFLdByThGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DChh8tzQU5FSVHDTcL/KsqdKajD/Fi7oUEERz9w9rxTZdwtPaROzKs9ihzq/bPdtT p/f4/FBrJyiwd0bxSQtXKMO7mS6u5lYsaFsGZYFepcnIAN8sPIT24W1CIoZDofmJI2 7PC2LgLp/lgIxaTWoIA5cTZ3TykG/UHHam4GQ7m41Z3sS+rKTjuTBZug3AtTl7HsUM PSo6D45PdpjzClyb9WHcutqH4MBSIjHWf73EdNsVAkjyAfV2yTuRPPZ+MnmYDNRE93 viNA+S5Jikh8ggMJbr8bFIyan+MZE5QEnOZaVHQNj34LTWK8A9Pst/6WUq192wZgz+ 4+5twFZDTPYkw== From: Sasha Levin To: stable@vger.kernel.org Cc: Alexandru Hossu , stable , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1.y 3/3] staging: rtl8723bs: fix OOB reads in rtw_get_sec_ie(), rtw_get_wapi_ie(), and rtw_get_wps_attr() Date: Tue, 14 Jul 2026 20:47:04 -0400 Message-ID: <20260715004704.3934423-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260715004704.3934423-1-sashal@kernel.org> References: <2026071359-barmaid-suspense-2f4d@gregkh> <20260715004704.3934423-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Alexandru Hossu [ Upstream commit 1463ca3ec6601cbb097d8d87dbf5dcf1cb86a344 ] Three IE/attribute parsing functions have missing bounds checks. rtw_get_sec_ie() and rtw_get_wapi_ie() iterate over a raw IE buffer without verifying that the header bytes (tag + length) are within the remaining buffer before reading them. Additionally, rtw_get_sec_ie() compares the 4-byte WPA OUI at cnt+2 without checking that at least 6 bytes remain, and rtw_get_wapi_ie() compares a 4-byte WAPI OUI at cnt+6 without checking that at least 10 bytes remain. rtw_get_wps_attr() reads wps_ie[0] and wps_ie+2 unconditionally at entry, before verifying that wps_ielen is large enough to contain the 6-byte WPS IE header (element_id + length + 4-byte OUI). Inside the attribute loop, get_unaligned_be16() is called on attr_ptr and attr_ptr+2 without checking that 4 bytes remain in the buffer. Add a cnt+2 bounds check before each loop body in rtw_get_sec_ie() and rtw_get_wapi_ie(), guard each multi-byte comparison with a minimum IE length requirement, add a wps_ielen < 6 early return in rtw_get_wps_attr(), and add a 4-byte bounds check in its inner loop. Fixes: 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver") Cc: stable Signed-off-by: Alexandru Hossu Link: https://patch.msgid.link/20260522004531.1038924-8-hossu.alexandru@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c index fa3677a2a8b32d..79ec71287b689a 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c +++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c @@ -584,9 +584,14 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len) cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_); while (cnt < in_len) { + if (cnt + 2 > in_len) + break; + if (cnt + 2 + in_ie[cnt + 1] > in_len) + break; authmode = in_ie[cnt]; if (authmode == WLAN_EID_BSS_AC_ACCESS_DELAY && + in_ie[cnt + 1] >= 8 && (!memcmp(&in_ie[cnt + 6], wapi_oui1, 4) || !memcmp(&in_ie[cnt + 6], wapi_oui2, 4))) { if (wapi_ie) @@ -619,9 +624,14 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_); while (cnt < in_len) { + if (cnt + 2 > in_len) + break; + if (cnt + 2 + in_ie[cnt + 1] > in_len) + break; authmode = in_ie[cnt]; if ((authmode == WLAN_EID_VENDOR_SPECIFIC) && + in_ie[cnt + 1] >= 4 && (!memcmp(&in_ie[cnt + 2], &wpa_oui[0], 4))) { if (wpa_ie) memcpy(wpa_ie, &in_ie[cnt], in_ie[cnt + 1] + 2); @@ -706,6 +716,9 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_att if (len_attr) *len_attr = 0; + if (wps_ielen < 6) + return attr_ptr; + if ((wps_ie[0] != WLAN_EID_VENDOR_SPECIFIC) || (memcmp(wps_ie + 2, wps_oui, 4))) { return attr_ptr; @@ -716,6 +729,8 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_att while (attr_ptr - wps_ie < wps_ielen) { /* 4 = 2(Attribute ID) + 2(Length) */ + if (attr_ptr + 4 > wps_ie + wps_ielen) + break; u16 attr_id = get_unaligned_be16(attr_ptr); u16 attr_data_len = get_unaligned_be16(attr_ptr + 2); u16 attr_len = attr_data_len + 4; -- 2.53.0