A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 23:24:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Move call to hdd power stats callback inside lock

Browse source 
Currently when host receives power stats from fw, before
processing these stats it check for the hdd callback and
processes these stats only if hdd callback is registered.
This callback is checked in
wma_unified_power_debug_stats_event_handler function before
processing of the fw event and outside of any lock. After
processing stats, this hdd cb is invoked, there is an issue
with this approach that while processing these stats if timeout
happens in hdd then hdd sets its callback as NULL and now after
processing stats wma handler invokes this hdd cb which is already
NULL, leading to null pointer dereference.

To avoid above issue, add sme callback and move null check for
hdd cb and call to hdd cb inside sme lock which is the same lock
used while setting hdd cb to null on timeout.

Change-Id: I2203083a17ca3404c5c5af98ddc48ba127e6aee2
CRs-Fixed: 2950633
This commit is contained in:
Ashish Kumar Dhanotiya 2021-05-24 17:46:07 +05:30 • committed by Gerrit - the friendly Code Review server
commit 887edeb65e
3 changed files with 64 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/sme/inc/sme_internal.h
View file

@ -392,6 +392,9 @@ struct sme_context {
void *power_debug_stats_context;
void (*power_stats_resp_callback)(struct power_stats_response *rsp,
void *callback_context);
void (*sme_power_debug_stats_callback)(
struct mac_context *mac,
struct power_stats_response *response);
#endif
#ifdef WLAN_FEATURE_BEACON_RECEPTION_STATS
void *beacon_stats_context;

56
core/sme/src/common/sme_api.c
View file

@ -733,6 +733,59 @@ static void sme_register_debug_callback(void)
}
#endif /* WLAN_FEATURE_MEMDUMP_ENABLE */
#ifdef WLAN_POWER_DEBUG
static void sme_power_debug_stats_cb(struct mac_context *mac,
struct power_stats_response *response)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
if (mac->sme.power_stats_resp_callback)
mac->sme.power_stats_resp_callback(
response,
mac->sme.power_debug_stats_context);
else
sme_err("Null hdd cb");
mac->sme.power_stats_resp_callback = NULL;
mac->sme.power_debug_stats_context = NULL;
sme_release_global_lock(&mac->sme);
}
}
static void sme_register_power_debug_stats_cb(struct mac_context *mac)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
mac->sme.sme_power_debug_stats_callback =
sme_power_debug_stats_cb;
sme_release_global_lock(&mac->sme);
}
}
static void sme_unregister_power_debug_stats_cb(struct mac_context *mac)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
mac->sme.sme_power_debug_stats_callback = NULL;
sme_release_global_lock(&mac->sme);
}
}
#else
static inline void sme_register_power_debug_stats_cb(struct mac_context *mac)
{
}
static inline void sme_unregister_power_debug_stats_cb(struct mac_context *mac)
{
}
#endif
/* Global APIs */
/**
@ -789,6 +842,7 @@ QDF_STATUS sme_open(mac_handle_t mac_handle)
}
sme_trace_init(mac);
sme_register_debug_callback();
sme_register_power_debug_stats_cb(mac);
return status;
}
@ -3178,6 +3232,8 @@ QDF_STATUS sme_close(mac_handle_t mac_handle)
if (!mac)
return QDF_STATUS_E_FAILURE;
sme_unregister_power_debug_stats_cb(mac);
status = csr_close(mac);
if (!QDF_IS_STATUS_SUCCESS(status)) {
sme_err("csr_close failed with status: %d", status);

13
core/wma/src/wma_features.c
View file

@ -4556,8 +4556,8 @@ int wma_unified_power_debug_stats_event_handler(void *handle,
param_buf = (wmi_pdev_chip_power_stats_event_fixed_param *)
param_tlvs->fixed_param;
if (!mac || !mac->sme.power_stats_resp_callback) {
wma_debug("NULL mac ptr or HDD callback is null");
if (!mac) {
wma_debug("NULL mac ptr");
return -EINVAL;
}
@ -4608,12 +4608,9 @@ int wma_unified_power_debug_stats_event_handler(void *handle,
qdf_mem_copy(power_stats_results->debug_registers,
debug_registers, stats_registers_len);
mac->sme.power_stats_resp_callback(power_stats_results,
mac->sme.power_debug_stats_context);
mac->sme.power_stats_resp_callback = NULL;
mac->sme.power_debug_stats_context = NULL;
if (mac->sme.sme_power_debug_stats_callback)
mac->sme.sme_power_debug_stats_callback(mac,
power_stats_results);
qdf_mem_free(power_stats_results);
return 0;