Skip to content

Commit

Permalink
V4L/DVB (3488): Snd_cx88_create: don't dereference NULL core
Browse files Browse the repository at this point in the history
If the call to cx88_core_get returns a NULL value, it is dereferenced
by cx88_reset, and perhaps by cx88_core_put.  Spotted by the Coverity
checker.

Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Duncan Sands authored and Linus Torvalds committed Mar 21, 2006
1 parent ae24601 commit 31dcbf9
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/media/video/cx88/cx88-alsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,11 @@ static int __devinit snd_cx88_create(snd_card_t *card, struct pci_dev *pci,
chip = (snd_cx88_card_t *) card->private_data;

core = cx88_core_get(pci);
if (NULL == core) {
err = -EINVAL;
kfree (chip);
return err;
}

if (!pci_dma_supported(pci,0xffffffff)) {
dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
Expand All @@ -688,11 +693,6 @@ static int __devinit snd_cx88_create(snd_card_t *card, struct pci_dev *pci,
spin_lock_init(&chip->reg_lock);

cx88_reset(core);
if (NULL == core) {
err = -EINVAL;
kfree (chip);
return err;
}
chip->core = core;

/* get irq */
Expand Down

0 comments on commit 31dcbf9

Please sign in to comment.