Merge "ASoC: msm: qdsp6v2: Add range checking in msm_dai_q6_set_channel_map" (f4129004) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c

+11 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2017, 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
		@@ -1714,6 +1714,11 @@ static int msm_dai_q6_set_channel_map(struct snd_soc_dai *dai,
		pr_err("%s: rx slot not found\n", __func__);
		return -EINVAL;
		}
		if (rx_num > AFE_PORT_MAX_AUDIO_CHAN_CNT) {
		pr_err("%s: invalid rx num %d\n", __func__, rx_num);
		return -EINVAL;
		}

		for (i = 0; i < rx_num; i++) {
		dai_data->port_config.slim_sch.shared_ch_mapping[i] =
		rx_slot[i];
		@@ -1744,6 +1749,11 @@ static int msm_dai_q6_set_channel_map(struct snd_soc_dai *dai,
		pr_err("%s: tx slot not found\n", __func__);
		return -EINVAL;
		}
		if (tx_num > AFE_PORT_MAX_AUDIO_CHAN_CNT) {
		pr_err("%s: invalid tx num %d\n", __func__, tx_num);
		return -EINVAL;
		}

		for (i = 0; i < tx_num; i++) {
		dai_data->port_config.slim_sch.shared_ch_mapping[i] =
		tx_slot[i];