summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuka Gejak <luka.gejak@linux.dev>2026-04-15 10:56:38 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2026-04-27 05:01:55 -0600
commitf051bc718b00446709e00e6b54bd6b4e2d4ce447 (patch)
tree8a620f3384e0086c2c213f1b84faa685eb346589
parent016f33c1a9a946de46ad8e0d06e542e07e944836 (diff)
downloadlinux-f051bc718b00446709e00e6b54bd6b4e2d4ce447.tar.gz
linux-f051bc718b00446709e00e6b54bd6b4e2d4ce447.zip
staging: rtl8723bs: clean up memcpy() in rtw_check_bcn_info
Move the ssid memcpy() inside the ie null-check to avoid calling it with a NULL-derived pointer (p + 2) when the ie is missing. While the kernel handles 0-length memcpy() safely as a no-op, keeping the call outside the check is confusing and poor practice. This change improves code readability. Signed-off-by: Luka Gejak <luka.gejak@linux.dev> Reviewed-by: Dan Carpenter <error27@gmail.com> Link: https://patch.msgid.link/20260415085638.6427-1-luka.gejak@linux.dev Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8723bs/core/rtw_wlan_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index c04419c9c3fc..3762ae6c4c65 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1204,8 +1204,8 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
ssid_len = *(p + 1);
if (ssid_len > NDIS_802_11_LENGTH_SSID)
ssid_len = 0;
+ memcpy(bssid->ssid.ssid, (p + 2), ssid_len);
}
- memcpy(bssid->ssid.ssid, (p + 2), ssid_len);
bssid->ssid.ssid_length = ssid_len;
if (memcmp(bssid->ssid.ssid, cur_network->network.ssid.ssid, 32) ||