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 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "dsp: q6lsm: Avoid null pointer access in SSR"

Browse source
This commit is contained in:
Linux Build Service Account 2018-09-18 22:27:35 -07:00 • committed by Gerrit - the friendly Code Review server
commit c223ed77f3
1 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
dsp/q6lsm.c
View file

@ -75,6 +75,8 @@ struct lsm_common {
};
static struct lsm_common lsm_common;
static DEFINE_MUTEX(session_lock);
/*
* mmap_handle_p can point either client->sound_model.mem_map_handle or
* lsm_common.mmap_handle_for_cal.
@ -95,6 +97,24 @@ static int q6lsm_memory_map_regions(struct lsm_client *client,
static int q6lsm_memory_unmap_regions(struct lsm_client *client,
uint32_t handle);
static int q6lsm_get_session_id_from_lsm_client(struct lsm_client *client)
{
int n;
for (n = LSM_MIN_SESSION_ID; n <= LSM_MAX_SESSION_ID; n++) {
if (lsm_session[n] == client)
return n;
}
pr_err("%s: cannot find matching lsm client. client = %pa\n",
__func__, client);
return LSM_INVALID_SESSION_ID;
}
static bool q6lsm_is_valid_lsm_client(struct lsm_client *client)
{
return q6lsm_get_session_id_from_lsm_client(client) ? 1 : 0;
}
static int q6lsm_callback(struct apr_client_data *data, void *priv)
{
struct lsm_client *client = (struct lsm_client *)priv;
@ -113,6 +133,13 @@ static int q6lsm_callback(struct apr_client_data *data, void *priv)
__func__, data->opcode, data->reset_event,
data->reset_proc);
mutex_lock(&session_lock);
if (!client || !q6lsm_is_valid_lsm_client(client)) {
pr_err("%s: client already freed/invalid, return\n",
__func__);
mutex_unlock(&session_lock);
return 0;
}
apr_reset(client->apr);
client->apr = NULL;
atomic_set(&client->cmd_state, CMD_STATE_CLEARED);
@ -122,6 +149,7 @@ static int q6lsm_callback(struct apr_client_data *data, void *priv)
mutex_lock(&lsm_common.cal_data[LSM_CUSTOM_TOP_IDX]->lock);
lsm_common.set_custom_topology = 1;
mutex_unlock(&lsm_common.cal_data[LSM_CUSTOM_TOP_IDX]->lock);
mutex_unlock(&session_lock);
return 0;
}
@ -334,6 +362,7 @@ void q6lsm_client_free(struct lsm_client *client)
pr_err("%s: Invalid Session %d\n", __func__, client->session);
return;
}
mutex_lock(&session_lock);
apr_deregister(client->apr);
client->mmap_apr = NULL;
q6lsm_session_free(client);
@ -341,6 +370,7 @@ void q6lsm_client_free(struct lsm_client *client)
mutex_destroy(&client->cmd_lock);
kfree(client);
client = NULL;
mutex_unlock(&session_lock);
}
EXPORT_SYMBOL(q6lsm_client_free);