Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8fcb2e28 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.12.r1-18100-SMxx50.QSSI14.0' of... 

Merge tag 'LA.UM.9.12.r1-18100-SMxx50.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn into android13-4.19-kona

"LA.UM.9.12.r1-18100-SMxx50.QSSI14.0"

* tag 'LA.UM.9.12.r1-18100-SMxx50.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn:
  qcacmn: Add sanity check to fix OOB issue
  qcacmn: Fix OOB issue

Change-Id: Icb222e07b683cc068034cf2022c9aade80fb55b3
parents f2e1c4c7 cd239480

drivers/staging/qca-wifi-host-cmn/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h

+4 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -215,6 +216,9 @@ 
#define WLAN_BSS_MEMBERSHIP_SELECTOR_SAE_H2E      123

#define WLAN_BSS_MEMBERSHIP_SELECTOR_HE_PHY       122



#define WLAN_MIN_HECAP_IE_LEN  22

#define WLAN_MAX_HECAP_IE_LEN  55



#define WLAN_CHAN_IS_5GHZ(chanidx) \

	((chanidx > 30) ? true : false)

#define WLAN_CHAN_IS_2GHZ(chanidx) \

drivers/staging/qca-wifi-host-cmn/umac/scan/dispatcher/src/wlan_scan_utils_api.c

+5 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -754,6 +754,9 @@ util_scan_parse_extn_ie(struct scan_cache_entry *scan_params, 
		scan_params->ie_list.srp   = (uint8_t *)ie;

		break;

	case WLAN_EXTN_ELEMID_HECAP:

		if ((extn_ie->ie_len < WLAN_MIN_HECAP_IE_LEN) ||

		    (extn_ie->ie_len > WLAN_MAX_HECAP_IE_LEN))

			return QDF_STATUS_E_INVAL;

		scan_params->ie_list.hecap = (uint8_t *)ie;

		break;

	case WLAN_EXTN_ELEMID_HEOP:
@@ -2008,7 +2011,7 @@ util_scan_parse_beacon_frame(struct wlan_objmgr_pdev *pdev, 
		mbssid_ie = util_scan_find_ie(WLAN_ELEMID_MULTIPLE_BSSID,

					      (uint8_t *)&bcn->ie, ie_len);

		if (mbssid_ie) {

			if (mbssid_ie[1] <= 0) {

			if (mbssid_ie[1] < 4) {

				scm_debug("MBSSID IE length is wrong %d",

					  mbssid_ie[1]);

				return status;