| Message ID | 20210131100916.7915-1-dinghao.liu@zju.edu.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0074946932cbd42647da947408a9d620746a4e0e |
| Headers | show |
| Series | ALSA: intel8x0: Fix missing check in snd_intel8x0m_create | expand |
On Sun, 31 Jan 2021 11:09:14 +0100, Dinghao Liu wrote: > > When device_type == DEVICE_ALI, we should also check the return > value of pci_iomap() to avoid potential null pointer dereference. > > Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> Thanks, applied. Takashi
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 1b7df0c4e57c..19872cecc9d2 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c @@ -1129,13 +1129,14 @@ static int snd_intel8x0m_create(struct snd_card *card, chip->bmaddr = pci_iomap(pci, 3, 0); else chip->bmaddr = pci_iomap(pci, 1, 0); + +port_inited: if (!chip->bmaddr) { dev_err(card->dev, "Controller space ioremap problem\n"); snd_intel8x0m_free(chip); return -EIO; } - port_inited: /* initialize offsets */ chip->bdbars_count = 2; tbl = intel_regs;
When device_type == DEVICE_ALI, we should also check the return value of pci_iomap() to avoid potential null pointer dereference. Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> --- sound/pci/intel8x0m.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)