Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dsp: fix total size in set ui property

Browse source 
Total size was incorrectly adjusted after determining
IID param size in SET_UI_PROPERTY. Fix total size with
correct APR packet and param sizes.

Change-Id: I5874b470811733e60b40cc240d4c0db995b30bac
Signed-off-by: Vikram Panduranga <vpandura@codeaurora.org>
This commit is contained in:
Vikram Panduranga 2018-08-07 17:06:25 -07:00
parent b7d3f59c2a
commit 99b0a75be7
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dsp/q6voice.c
View file

@ -9564,6 +9564,8 @@ static int voice_pack_and_set_cvs_ui_property(struct voice_data *v,
{ {
struct vss_icommon_cmd_set_ui_property *set_ui_property = NULL; struct vss_icommon_cmd_set_ui_property *set_ui_property = NULL;
u32 total_size = 0; u32 total_size = 0;
u32 pkt_size = 0;
u32 param_size = 0;
bool iid_supported = q6common_is_instance_id_supported(); bool iid_supported = q6common_is_instance_id_supported();
void *apr_cvs; void *apr_cvs;
int ret = 0; int ret = 0;
@ -9574,14 +9576,15 @@ static int voice_pack_and_set_cvs_ui_property(struct voice_data *v,
return -EINVAL; return -EINVAL;
} }
total_size = sizeof(struct vss_icommon_cmd_set_ui_property) + pkt_size = sizeof(struct vss_icommon_cmd_set_ui_property);
sizeof(union param_hdrs) + param_hdr.param_size; param_size = sizeof(union param_hdrs) + param_hdr.param_size;
total_size = pkt_size + param_size;
set_ui_property = kzalloc(total_size, GFP_KERNEL); set_ui_property = kzalloc(total_size, GFP_KERNEL);
if (!set_ui_property) if (!set_ui_property)
return -ENOMEM; return -ENOMEM;
ret = q6common_pack_pp_params(set_ui_property->param_data, &param_hdr, ret = q6common_pack_pp_params(set_ui_property->param_data, &param_hdr,
param_data, &total_size); param_data, &param_size);
if (ret) { if (ret) {
pr_err("%s: Failed to pack params, error %d", __func__, ret); pr_err("%s: Failed to pack params, error %d", __func__, ret);
goto done; goto done;
@ -9591,11 +9594,11 @@ static int voice_pack_and_set_cvs_ui_property(struct voice_data *v,
* Pack the APR header after packing the data so we have the actual * Pack the APR header after packing the data so we have the actual
* total size of the payload * total size of the payload
*/ */
total_size = pkt_size + param_size;
set_ui_property->apr_hdr.hdr_field = set_ui_property->apr_hdr.hdr_field =
APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, APR_HDR_LEN(APR_HDR_SIZE), APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, APR_HDR_LEN(APR_HDR_SIZE),
APR_PKT_VER); APR_PKT_VER);
set_ui_property->apr_hdr.pkt_size = set_ui_property->apr_hdr.pkt_size = total_size;
APR_PKT_SIZE(APR_HDR_SIZE, total_size - APR_HDR_SIZE);
set_ui_property->apr_hdr.src_svc = 0; set_ui_property->apr_hdr.src_svc = 0;
set_ui_property->apr_hdr.src_domain = APR_DOMAIN_APPS; set_ui_property->apr_hdr.src_domain = APR_DOMAIN_APPS;
set_ui_property->apr_hdr.src_port = set_ui_property->apr_hdr.src_port =