Skip to content

Commit c61711c

Browse files
ajitkupandeybroonie
authored andcommitted
ASoC: SOF: Fix NULL pointer exception in sof_pci_probe callback
We are accessing "desc->ops" in sof_pci_probe without checking "desc" pointer. This results in NULL pointer exception if pci_id->driver_data i.e desc pointer isn't defined in sof device probe: BUG: kernel NULL pointer dereference, address: 0000000000000060 PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP NOPTI RIP: 0010:sof_pci_probe+0x1e/0x17f [snd_sof_pci] Code: Unable to access opcode bytes at RIP 0xffffffffc043dff4. RSP: 0018:ffffac4b03b9b8d8 EFLAGS: 00010246 Add NULL pointer check for sof_dev_desc pointer to avoid such exception. Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20220426183357.102155-1-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent aa22125 commit c61711c

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

sound/soc/sof/sof-pci-dev.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,11 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
153153

154154
dev_dbg(&pci->dev, "PCI DSP detected");
155155

156+
if (!desc) {
157+
dev_err(dev, "error: no matching PCI descriptor\n");
158+
return -ENODEV;
159+
}
160+
156161
if (!desc->ops) {
157162
dev_err(dev, "error: no matching PCI descriptor ops\n");
158163
return -ENODEV;

0 commit comments

Comments
 (0)