diff options
| author | Yong Zhi <yong.zhi@intel.com> | 2018-08-13 18:15:14 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-14 16:21:13 +0100 |
| commit | 12eeeb4f4733bbc4481d01df35933fc15beb8b19 (patch) | |
| tree | 146bbc33e5d02c825d843917c15fe1d181836122 /sound | |
| parent | fb504caae7ef85be159743bd4b08ecde269ba55f (diff) | |
| download | linux-0-day-12eeeb4f4733bbc4481d01df35933fc15beb8b19.tar.gz linux-0-day-12eeeb4f4733bbc4481d01df35933fc15beb8b19.tar.xz | |
ASoC: Intel: Skylake: Acquire irq after RIRB allocation
Cold reboot stress test found that the hda irq could access rirb ring
buffer before its memory gets allocated which resulting in null
pointer dereference inside snd_hdac_bus_update_rirb().
Fix it by moving the skl_acquire_irq after ring buffer allocation.
While here, also change err return from -EBUSY to actual error code.
Signed-off-by: Yong Zhi <yong.zhi@intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/skylake/skl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index dce6494856494..cf09721ca13ef 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -838,11 +838,7 @@ static int skl_first_init(struct hdac_bus *bus) snd_hdac_bus_parse_capabilities(bus); - if (skl_acquire_irq(bus, 0) < 0) - return -EBUSY; - pci_set_master(pci); - synchronize_irq(bus->irq); gcap = snd_hdac_chip_readw(bus, GCAP); dev_dbg(bus->dev, "chipset global capabilities = 0x%x\n", gcap); @@ -875,6 +871,12 @@ static int skl_first_init(struct hdac_bus *bus) if (err < 0) return err; + err = skl_acquire_irq(bus, 0); + if (err < 0) + return err; + + synchronize_irq(bus->irq); + /* initialize chip */ skl_init_pci(skl); |