cfg80211_rtw_scan: fix NULL pointer dereference in Wi-Fi Direct logic

This commit is contained in:
Nikolay Edigaryev 2022-12-09 12:03:36 +04:00
parent a4a3f52912
commit 0043022f0c

View File

@ -2958,7 +2958,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
#endif #endif
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
if (pwdinfo->driver_interface == DRIVER_CFG80211) { if (pwdinfo->driver_interface == DRIVER_CFG80211) {
if (_rtw_memcmp(ssids->ssid, "DIRECT-", 7) if (ssids && _rtw_memcmp(ssids->ssid, "DIRECT-", 7)
&& rtw_get_p2p_ie((u8 *)request->ie, request->ie_len, NULL, NULL) && rtw_get_p2p_ie((u8 *)request->ie, request->ie_len, NULL, NULL)
) { ) {
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
@ -3065,7 +3065,7 @@ bypass_p2p_chk:
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
if (pwdinfo->driver_interface == DRIVER_CFG80211) { if (pwdinfo->driver_interface == DRIVER_CFG80211) {
if (ssids->ssid != NULL if (ssids
&& _rtw_memcmp(ssids->ssid, "DIRECT-", 7) && _rtw_memcmp(ssids->ssid, "DIRECT-", 7)
&& rtw_get_p2p_ie((u8 *)request->ie, request->ie_len, NULL, NULL) && rtw_get_p2p_ie((u8 *)request->ie, request->ie_len, NULL, NULL)
) { ) {