From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Fabio Aiuto <fabioaiuto83@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.10.y 3/4] staging: rtl8723bs: remove commented out DBG_871X logs
Date: Thu, 10 Sep 2026 07:09:05 -0400
Message-ID: <20260910110906.4147966-3-sashal@kernel.org>
In-Reply-To: <20260910110906.4147966-1-sashal@kernel.org>
References: <2026090853-convent-spill-68e6@gregkh>
 <20260910110906.4147966-1-sashal@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

From: Fabio Aiuto <fabioaiuto83@gmail.com>

[ Upstream commit 68e79909e1d84251ae1889cbad45672f5ba85d7e ]

remove all commented out DBG_871X logs unmatched by
semantic patch.

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/125e216e3bb5bc938e06b15dadfbbf51d9517dde.1617802415.git.fabioaiuto83@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

For this stable backport, retain only the commented DBG_871X deletion in
rtw_get_wps_attr(). It removes the line that prevents the unchanged patch
for 99aa998dec83 ("staging: rtl8723bs: fix OOB read / stack overflow in
rtw_get_wps_attr()") from matching its insertion context.

Drop the unrelated log cleanup in the other 25 files. Those hunks are
unnecessary for the target and overlap older stable code, including
existing bounds checks and debug counters. No executable code or
functions are added or changed by this dependency.

[ sashal: Reduced backport -- upstream 68e79909e1d84 touches 26 file(s), this
  backport carries 1. Not backported here:
  drivers/staging/rtl8723bs/core/rtw_ap.c
  drivers/staging/rtl8723bs/core/rtw_cmd.c
  drivers/staging/rtl8723bs/core/rtw_efuse.c
  drivers/staging/rtl8723bs/core/rtw_io.c
  drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
  drivers/staging/rtl8723bs/core/rtw_mlme.c
  drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
  drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
  ... and 17 more
  This note is generated from the file lists only; see the resolution record
  for the reasoning. ]

Stable-dep-of: 99aa998dec83 ("staging: rtl8723bs: fix OOB read / stack overflow in rtw_get_wps_attr()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index 3f2ee8b34e254..82bd36f3c1cfe 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -798,7 +798,6 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_att
 		u16 attr_data_len = get_unaligned_be16(attr_ptr + 2);
 		u16 attr_len = attr_data_len + 4;
 
-		/* DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __func__, attr_ptr, attr_id, attr_data_len); */
 		if (attr_id == target_attr_id) {
 			target_attr_ptr = attr_ptr;
 
-- 
2.53.0