Commit 5b3a7c16 authored Jul 30, 2024 by Amadeusz Sławiński Committed by Zheng Yejian Jul 30, 2024

ASoC: topology: Do not assign fields that are already set

mainline inclusion
from mainline-v6.10-rc6
commit daf0b99d4720c9f05bdb81c73b2efdb43fa9def3
category: cleanup
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAGELE
CVE: CVE-2024-41069

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=daf0b99d4720c9f05bdb81c73b2efdb43fa9def3



--------------------------------

The routes are allocated with kzalloc(), so all fields are zeroed by
default, skip unnecessary assignments.

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20240603102818.36165-4-amadeuszx.slawinski@linux.intel.com


Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>

parent d952767d

sound/soc/soc-topology.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -1072,11 +1072,7 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg,
		break;
		}

		/* set to NULL atm for tplg users */
		route->connected = NULL;
		if (strnlen(elem->control, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == 0) {
		route->control = NULL;
		} else {
		if (strnlen(elem->control, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) != 0) {
		route->control = devm_kmemdup(tplg->dev, elem->control,
		min(strlen(elem->control),
		SNDRV_CTL_ELEM_ID_NAME_MAXLEN),