ASoC: Intel: sst-acpi: Fix Oops in case of missing firmware
Subsystems (3)
PATCH 1/1 ASoC: Intel: sst-acpi: Fix Oops in case of missing firmware
I swear I tested missing firmware in commit e5161d7987f1 ("ASoC: Intel:
sst-acpi: Request firmware before SST platform driver probing").
Unfortunately same wasn't done in commit 6dda27cbbd1d ("ASoC: Intel:
sst-acpi: Add support for multiple machine drivers per platform") which will cause NULL pointer dereference in sst_acpi_fw_cb() when printing the error since sst_acpi->mach is not set.
Fix this obvious error by setting the sst_acpi->mach in sst_acpi_probe().
--- sound/soc/intel/sst-acpi.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/intel/sst-acpi.c +1 -0
@@ -139,6 +139,7 @@ static int sst_acpi_probe(struct platform_device *pdev) sst_pdata = &sst_acpi->sst_pdata; sst_pdata->id = desc->sst_id; sst_acpi->desc = desc; + sst_acpi->mach = mach;if (desc->resindex_dma_base >=0 ) { sst_pdata->dma_engine = desc->dma_engine;
Signature · 1 line
1.8.5.3
Quoted 8 lines · Jarkko Nikula
I swear I tested missing firmware in commit
e5161d7987f1("ASoC: Intel:
sst-acpi: Request firmware before SST platform driver probing").Unfortunately same wasn't done in commit
6dda27cbbd1d("ASoC: Intel:
sst-acpi: Add support for multiple machine drivers per platform") which will cause NULL pointer dereference insst_acpi_fw_cb()when printing the error sincesst_acpi->machis not set.
Quoted 4 lines
Fix this obvious error by setting the
sst_acpi->machinsst_acpi_probe().Reported-by Mika Westerberg <[email protected]>Signed-off-by Jarkko Nikula <[email protected]>
Quoted 9 lines · Jarkko Nikula
I swear I tested missing firmware in commit
e5161d7987f1("ASoC: Intel:
sst-acpi: Request firmware before SST platform driver probing").Unfortunately same wasn't done in commit
6dda27cbbd1d("ASoC: Intel:
sst-acpi: Add support for multiple machine drivers per platform") which will cause NULL pointer dereference insst_acpi_fw_cb()when printing the error sincesst_acpi->machis not set.Fix this obvious error by setting the
sst_acpi->machinsst_acpi_probe().
FWIW, I did test with the patch set from lrg's tree as of a couple days ago, and hit this crash. So I can confirm the bug for sure. I'll test the fix with a new kernel build in a couple of hours.
Signature · 4 lines
Adam Williamson Fedora QA Community Monkey IRC: adamw | Twitter: AdamW_Fedora | XMPP: adamw AT happyassassin . net http://www.happyassassin.net
Quoted 2 lines · Jarkko Nikula
I swear I tested missing firmware in commit
e5161d7987f1("ASoC: Intel:
sst-acpi: Request firmware before SST platform driver probing").
Applied, thanks.