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

Commit 1c04162e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dsp: Address information leak in dsp drivers"

parents 7e844dff 56fd62a4

dsp/q6usm.c

+2 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.

 */

#include <linux/mutex.h>

#include <linux/wait.h>
@@ -898,6 +899,7 @@ int q6usm_enc_cfg_blk(struct us_client *usc, struct us_encdec_cfg *us_cfg) 
	       sizeof(struct usm_cfg_common));



	/* Transparent data copy */

	memset(enc_cfg->enc_blk.transp_data, 0, sizeof (enc_cfg->enc_blk.transp_data));

	memcpy(enc_cfg->enc_blk.transp_data, us_cfg->params,

	       us_cfg->params_size);

	pr_debug("%s: cfg_size[%d], params_size[%d]\n",

dsp/q6voice.c

+7 −0
Original line number Diff line number Diff line
@@ -1164,6 +1164,10 @@ static int voice_create_mvm_cvs_session(struct voice_data *v) 
						common.mvs_info.media_type;

			cvs_full_ctl_cmd.cvs_session.network_id =

					       common.mvs_info.network_type;



			memset(cvs_full_ctl_cmd.cvs_session.name, 0,

				sizeof(cvs_full_ctl_cmd.cvs_session.name));



			strlcpy(cvs_full_ctl_cmd.cvs_session.name,

				"default q6 voice",

				strlen("default q6 voice")+1);
@@ -3079,6 +3083,9 @@ static int voice_send_cvp_create_cmd(struct voice_data *v) 
						 VSS_IVOCPROC_PORT_ID_NONE;

	}



	memset(cvp_session_cmd.cvp_session.name, 0,

                        sizeof(cvp_session_cmd.cvp_session.name));



	pr_debug("tx_topology: %d tx_port_id=%d, rx_port_id=%d, mode: 0x%x\n",

		cvp_session_cmd.cvp_session.tx_topology_id,

		cvp_session_cmd.cvp_session.tx_port_id,