]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: SOF: Intel: hda: add sanity check on SSP index reported by NHLT
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Mon, 25 Jul 2022 19:53:41 +0000 (14:53 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Aug 2022 09:45:50 +0000 (11:45 +0200)
[ Upstream commit e51699505042fb365df3a0ce68b850ccd9ad0108 ]

We should have a limited trust in the BIOS and verify that the SSP
index reported in NHLT is valid for each platform.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220725195343.145603-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/sof/intel/hda.c

index ed495b7ad1a9f6e31b3f4f03e22216b4520e7d5e..17f2f3a982c38e8bab67229efed6c79ba28583ea 100644 (file)
@@ -1395,6 +1395,7 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev)
 
                if (mach->tplg_quirk_mask & SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER &&
                    mach->mach_params.i2s_link_mask) {
+                       const struct sof_intel_dsp_desc *chip = get_chip_info(sdev->pdata);
                        int ssp_num;
 
                        if (hweight_long(mach->mach_params.i2s_link_mask) > 1 &&
@@ -1404,6 +1405,12 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev)
                        /* fls returns 1-based results, SSPs indices are 0-based */
                        ssp_num = fls(mach->mach_params.i2s_link_mask) - 1;
 
+                       if (ssp_num >= chip->ssp_count) {
+                               dev_err(sdev->dev, "Invalid SSP %d, max on this platform is %d\n",
+                                       ssp_num, chip->ssp_count);
+                               return NULL;
+                       }
+
                        tplg_filename = devm_kasprintf(sdev->dev, GFP_KERNEL,
                                                       "%s%s%d",
                                                       sof_pdata->tplg_filename,