Merge "ASoC: msm: Fix KW issues for audio drivers"

drivers/char/adsprpc.c

@@ -1188,7 +1188,10 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx)
 		if (err)
 			goto bail;
 	}
-	if (ctx->buf->virt && metalen <= copylen)
+	VERIFY(err, ctx->buf->virt != NULL);
+	if (err)
+		goto bail;
+	if (metalen <= copylen)
 		memset(ctx->buf->virt, 0, metalen);
 
 	/* copy metadata */

drivers/soc/qcom/qdsp6v2/msm_audio_ion.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -827,6 +827,11 @@ static int msm_audio_smmu_init_legacy(struct device *dev)
 		return -EINVAL;
 	}
 	msm_audio_ion_data.cb_dev = msm_iommu_get_ctx(cb->name);
+	if (msm_audio_ion_data.cb_dev == NULL) {
+		dev_err(dev, "%s Could not find IOMMU context\n",
+			__func__);
+		return -EINVAL;
+	}
 	cb->addr_range.start = (dma_addr_t) read_val[0];
 	cb->addr_range.size = (size_t) read_val[1];
 	dev_dbg(dev, "%s Legacy iommu usage\n", __func__);

sound/soc/msm/qdsp6v2/msm-lsm-client.c

@@ -570,7 +570,7 @@ static int msm_lsm_reg_model(struct snd_pcm_substream *substream,
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	int rc = 0;
 	u8 *snd_model_ptr;
-	size_t offset;
+	size_t offset = 0;
 
 	rc = q6lsm_snd_model_buf_alloc(prtd->lsm_client,
 				       p_info->param_size,

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -16713,7 +16713,7 @@ int msm_routing_set_downmix_control_data(int be_id, int session_id,
 {
 	int i, rc = 0;
 	struct adm_pspd_param_data_t data;
-	struct audproc_chmixer_param_coeff dnmix_cfg;
+	struct audproc_chmixer_param_coeff dnmix_cfg = {0,};
 	uint16_t variable_payload = 0;
 	char *adm_params = NULL;
 	int port_id, copp_idx = 0;

sound/soc/msm/qdsp6v2/q6adm.c

@@ -419,7 +419,7 @@ int adm_programable_channel_mixer(int port_id, int copp_idx, int session_id,
 				  int channel_index)
 {
 	struct adm_cmd_set_pspd_mtmx_strtr_params_v5 *adm_params = NULL;
-	struct param_hdr_v3 data_v5;
+	struct param_hdr_v3 data_v5 = {0,};
 	int ret = 0, port_idx, sz = 0, param_size = 0;
 	u16 *adm_pspd_params;
 	u16 *ptr;

sound/soc/msm/qdsp6v2/q6core.c

@@ -629,7 +629,7 @@ uint32_t core_set_dolby_manufacturer_id(int manufacturer_id)
 
 bool q6core_is_adsp_ready(void)
 {
-	int rc;
+	int rc = 0;
 	bool ret = false;
 	struct apr_hdr hdr;