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

Unverified Commit 42903109 authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Merge tag 'LA.UM.9.12.r1-15600-SMxx50.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-15600-SMxx50.0"

* tag 'LA.UM.9.12.r1-15600-SMxx50.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn:
  qcacmn: check bssid hint for OWE transition mode
  qcacmn: Fix possible OOB write in extract_time_sync_ftm_offset_event_tlv

Change-Id: Ica582871bc5f86e68b650663deb667d49b1d5a2c
parents f39b7e13 4233f6c8

drivers/staging/qca-wifi-host-cmn/umac/scan/core/src/wlan_scan_filter.c

+3 −1
Original line number Diff line number Diff line
@@ -1179,7 +1179,9 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc, 
	 */

	if (!match && util_scan_entry_is_hidden_ap(db_entry)) {

		for (i = 0; i < filter->num_of_auth; i++) {

			if (filter->auth_type[i] == WLAN_AUTH_TYPE_OWE) {

			if (filter->auth_type[i] == WLAN_AUTH_TYPE_OWE &&

			    util_is_bssid_match(&filter->bssid_hint,

						&db_entry->bssid)) {

				match = true;

				break;

			}

drivers/staging/qca-wifi-host-cmn/wmi/src/wmi_unified_tlv.c

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

 * Copyright (c) 2016-2021 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
@@ -13276,6 +13277,9 @@ extract_time_sync_ftm_offset_event_tlv(wmi_unified_t wmi, void *buf, 


	param->vdev_id = resp_event->vdev_id;

	param->num_qtime = param_buf->num_audio_sync_q_master_slave_times;

	if (param->num_qtime > FTM_TIME_SYNC_QTIME_PAIR_MAX)

		param->num_qtime = FTM_TIME_SYNC_QTIME_PAIR_MAX;



	q_pair = param_buf->audio_sync_q_master_slave_times;

	if (!q_pair) {

		WMI_LOGE("Invalid q_master_slave_times buffer");