2021-01-31 12:26:29

by Dinghao Liu

Subject: [PATCH] ALSA: intel8x0: Fix missing check in snd_intel8x0m_create

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 <[email protected]>
---
sound/pci/intel8x0m.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

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;
--
2.17.1

2021-02-01 08:19:19

by Takashi Iwai

Subject: Re: [PATCH] ALSA: intel8x0: Fix missing check in snd_intel8x0m_create

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 <[email protected]>

Thanks, applied.


Takashi