From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?=

 <amadeuszx.slawinski@linux.intel.com>

Date: Sat, 28 Jan 2023 00:11:01 +0100

Subject: [PATCH] ASoC: topology: Properly access value coming from topology

 file

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

References: bsc#1012628

Patch-mainline: 6.2.3

Git-commit: c5d184c92df2b631fb81fe2ce6e96bfc5ba720e5

[ Upstream commit c5d184c92df2b631fb81fe2ce6e96bfc5ba720e5 ]

When accessing values coming from topology, le32_to_cpu should be used.

One of recent commits missed that.

Fixes: 86e2d14b6d1a ("ASoC: topology: Add header payload_size verification")

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>

Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>

Link: https://lore.kernel.org/r/20230127231111.937721-2-amadeuszx.slawinski@linux.intel.com

Signed-off-by: Mark Brown <broonie@kernel.org>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 sound/soc/soc-topology.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c

index a79a2fb2..d68c4855 100644

--- a/sound/soc/soc-topology.c

+++ b/sound/soc/soc-topology.c

@@ -2408,7 +2408,7 @@ static int soc_valid_header(struct soc_tplg *tplg,

 		return -EINVAL;

 	}

-	if (soc_tplg_get_hdr_offset(tplg) + hdr->payload_size >= tplg->fw->size) {

+	if (soc_tplg_get_hdr_offset(tplg) + le32_to_cpu(hdr->payload_size) >= tplg->fw->size) {

 		dev_err(tplg->dev,

 			"ASoC: invalid header of type %d at offset %ld payload_size %d\n",

 			le32_to_cpu(hdr->type), soc_tplg_get_hdr_offset(tplg),

-- 

2.35.3