diff mbox series

[04/12] ASoC: SOF: imx: imx8: Bar index is only valid for IRAM and SRAM types

Message ID 20210915122116.18317-5-peter.ujfalusi@linux.intel.com
State Accepted
Commit 10d93a98190aec2c3ff98d9472ab1bf0543aa02c
Headers show
Series ASoC: SOF: Abstract away the 'bar' usage (mostly) | expand

Commit Message

Peter Ujfalusi Sept. 15, 2021, 12:21 p.m. UTC
i.MX8 only uses SOF_FW_BLK_TYPE_IRAM (1) and SOF_FW_BLK_TYPE_SRAM (3)
bars, everything else is left as 0 in sdev->bar[] array.

If a broken or purposefully crafted firmware image is loaded with other
types of FW_BLK_TYPE then a kernel crash can be triggered.

Make sure that only IRAM/SRAM type is converted to bar index.
Fixes: 202acc565a1f0 ("ASoC: SOF: imx: Add i.MX8 HW support")
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@gmail.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
 sound/soc/sof/imx/imx8.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
diff mbox series


diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
index 326aa65166c2..150f1bc3fb95 100644
--- a/sound/soc/sof/imx/imx8.c
+++ b/sound/soc/sof/imx/imx8.c
@@ -365,7 +365,14 @@  static int imx8_remove(struct snd_sof_dev *sdev)
 /* on i.MX8 there is 1 to 1 match between type and BAR idx */
 static int imx8_get_bar_index(struct snd_sof_dev *sdev, u32 type)
-	return type;
+	/* Only IRAM and SRAM bars are valid */
+	switch (type) {
+		return type;
+	default:
+		return -EINVAL;
+	}
 static void imx8_ipc_msg_data(struct snd_sof_dev *sdev,