evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: msm: Fix kernel crash in core_set_license

Browse source 
Remove the unused audio_cal_info_metainfo structure pointer
as it leads to a NULL pointer access and to a crash.

CRs-Fixed: 1105060
Change-Id: I6c7ce3976ac87a7b83a83dbd4ad8f46466f6f813
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
This commit is contained in:
Aditya Bavanari 2016-12-23 16:33:14 +05:30 • committed by Gerrit - the friendly Code Review server
parent 55e8426a19
commit f8cfc2b728
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sound/soc/msm/qdsp6v2/q6core.c
View file

@ -221,7 +221,6 @@ struct cal_block_data *cal_utils_get_cal_block_by_key(
int32_t core_set_license(uint32_t key, uint32_t module_id)
{
struct avcs_cmd_set_license *cmd_setl = NULL;
struct audio_cal_info_metainfo *metainfo = NULL;
struct cal_block_data *cal_block = NULL;
int rc = 0, packet_size = 0;
@ -278,9 +277,9 @@ int32_t core_set_license(uint32_t key, uint32_t module_id)
memcpy((uint8_t *)cmd_setl + sizeof(struct avcs_cmd_set_license),
cal_block->cal_data.kvaddr,
cal_block->cal_data.size);
pr_info("%s: Set license opcode=0x%x ,key=0x%x, id =0x%x, size = %d\n",
pr_info("%s: Set license opcode=0x%x, id =0x%x, size = %d\n",
__func__, cmd_setl->hdr.opcode,
metainfo->nKey, cmd_setl->id, cmd_setl->size);
cmd_setl->id, cmd_setl->size);
rc = apr_send_pkt(q6core_lcl.core_handle_q, (uint32_t *)cmd_setl);
if (rc < 0)
pr_err("%s: SET_LICENSE failed op[0x%x]rc[%d]\n",