From: Luka Gejak Date: Wed, 15 Apr 2026 08:56:38 +0000 (+0200) Subject: staging: rtl8723bs: clean up memcpy() in rtw_check_bcn_info X-Git-Tag: v7.2-rc1~66^2~146 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=f051bc718b00446709e00e6b54bd6b4e2d4ce447;p=thirdparty%2Flinux.git 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 Reviewed-by: Dan Carpenter Link: https://patch.msgid.link/20260415085638.6427-1-luka.gejak@linux.dev Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c index c04419c9c3fc3..3762ae6c4c65d 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) ||