Unverified Commit 523773b9 authored May 20, 2020 by Karol Trzcinski Committed by Mark Brown May 25, 2020

ASoC: SOF: loader: Adjust validation condition for fw_offset



Condition in if statement should be same as trace message
and FW size equal to zero (after skipping offset) should
be marked as invalid.

Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200520165911.21696-2-kai.vehmanen@linux.intel.com


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

parent 29c859df

sound/soc/sof/intel/hda-loader.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -293,7 +293,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev)

		chip_info = desc->chip_info;

		if (plat_data->fw->size < plat_data->fw_offset) {
		if (plat_data->fw->size <= plat_data->fw_offset) {
		dev_err(sdev->dev, "error: firmware size must be greater than firmware offset\n");
		return -EINVAL;
		}

sound/soc/sof/loader.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -385,7 +385,7 @@ static int check_header(struct snd_sof_dev sdev, const struct firmware fw,
		struct snd_sof_fw_header *header;
		size_t fw_size = fw->size - fw_offset;

		if (fw->size < fw_offset) {
		if (fw->size <= fw_offset) {
		dev_err(sdev->dev, "error: firmware size must be greater than firmware offset\n");
		return -EINVAL;
		}