Skip to contentSkip to conversation

oss/btaudio.c: Check ioremap return value and free

PATCH In review ville palo 2 participants 3 messages Sep 3, 2006 – Sep 5, 2006

Subsystems (2)
lore
Share & tools
lore

ville palo

author
#0 lore raw

PATCH 1/1 oss/btaudio.c: Check ioremap return value and free

Check return value of the ioremap() and balance ioremap() with iounmap().

sound/oss/btaudio.c +7 -0
index 324a81f..9b1837f 100644
@@ -927,6 +927,10 @@ static int __devinit btaudio_probe(struc
 	bta->mem  = pci_resource_start(pci_dev,0);
 	bta->mmio = ioremap(pci_resource_start(pci_dev,0),
 			    pci_resource_len(pci_dev,0));
+	if (!bta->mmio) {
+		rc = -EIO;
+		goto fail1;
+	}
 
 	bta->source     = 1;
 	bta->bits       = 8;
@@ -1019,6 +1023,7 @@ static int __devinit btaudio_probe(struc
 		unregister_sound_dsp(bta->dsp_digital);
  fail2:
         free_irq(bta->irq,bta);	
+	iounmap(bta->mmio);
  fail1:
 	kfree(bta);
  fail0:
@@ -1047,6 +1052,8 @@ static void __devexit btaudio_remove(str
 	}
 
 	/* free resources */
+	if (bta->mmio)
+		iounmap(bta->mmio);
 	free_buffer(bta);
         free_irq(bta->irq,bta);
 	release_mem_region(pci_resource_start(pci_dev,0),

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw
Quoted 22 lines · ville palo

Check return value of the ioremap() and balance ioremap() with iounmap().

sound/oss/btaudio.c +4 -0
index 324a81f..9b1837f 100644
@@ -927,6 +927,10 @@ static int __devinit btaudio_probe(struc
 	bta->mem  = pci_resource_start(pci_dev,0);
 	bta->mmio = ioremap(pci_resource_start(pci_dev,0),
 			    pci_resource_len(pci_dev,0));
+	if (!bta->mmio) {
+		rc = -EIO;
+		goto fail1;
+	}
 
 	bta->source     = 1;
 	bta->bits       = 8;

sound/oss/btaudio.c static int __devinit btaudio_probe(struc · line 1026

Quoted 4 lines
sound/oss/btaudio.c +1 -0
@@ -1019,6 +1023,7 @@ static int __devinit btaudio_probe(struc
 		unregister_sound_dsp(bta->dsp_digital);
  fail2:
         free_irq(bta->irq,bta);	
+	iounmap(bta->mmio);

Why here?
This won't work if ie. request_irq fails.

Domen

Quoted 14 lines
sound/oss/btaudio.c +2 -0
  fail1:
 	kfree(bta);
  fail0:
@@ -1047,6 +1052,8 @@ static void __devexit btaudio_remove(str
 	}
 
 	/* free resources */
+	if (bta->mmio)
+		iounmap(bta->mmio);
 	free_buffer(bta);
         free_irq(bta->irq,bta);
 	release_mem_region(pci_resource_start(pci_dev,0),
Quoted 4 lines

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#2 lore raw
In reply to ville palo
Quoted 20 lines · Domen Puncer
Quoted 19 lines · ville palo

Check return value of the ioremap() and balance ioremap() with iounmap().

sound/oss/btaudio.c +4 -0
index 324a81f..9b1837f 100644
@@ -927,6 +927,10 @@ static int __devinit btaudio_probe(struc
 	bta->mem  = pci_resource_start(pci_dev,0);
 	bta->mmio = ioremap(pci_resource_start(pci_dev,0),
 			    pci_resource_len(pci_dev,0));
+	if (!bta->mmio) {
+		rc = -EIO;
+		goto fail1;
+	}
 
Quoted 11 lines

sound/oss/btaudio.c static int __devinit btaudio_probe(struc · line 1026

Quoted 7 lines
sound/oss/btaudio.c +1 -0
 	bta->source     = 1;
 	bta->bits       = 8;
@@ -1019,6 +1023,7 @@ static int __devinit btaudio_probe(struc
 		unregister_sound_dsp(bta->dsp_digital);
  fail2:
         free_irq(bta->irq,bta);	
+	iounmap(bta->mmio);

Why here?
This won't work if ie. request_irq fails.

Thanks, you are right. Here's the corrected patch

sound/oss/btaudio.c +16 -8
index 324a81f..d6c21b0 100644
@@ -927,6 +927,10 @@ static int __devinit btaudio_probe(struc
 	bta->mem  = pci_resource_start(pci_dev,0);
 	bta->mmio = ioremap(pci_resource_start(pci_dev,0),
 			    pci_resource_len(pci_dev,0));
+	if (!bta->mmio) {
+		rc = -EIO;
+		goto fail1;
+	}
 
 	bta->source     = 1;
 	bta->bits       = 8;
@@ -970,7 +974,7 @@ static int __devinit btaudio_probe(struc
 			      "btaudio",(void *)bta)) < 0) {
 		printk(KERN_WARNING
 		       "btaudio: can't request irq (rc=%d)\n",rc);
-		goto fail1;
+		goto fail2;
 	}
 
 	/* register devices */
@@ -980,7 +984,7 @@ static int __devinit btaudio_probe(struc
 		if (rc < 0) {
 			printk(KERN_WARNING
 			       "btaudio: can't register digital dsp (rc=%d)\n",rc);
-			goto fail2;
+			goto fail3;
 		}
 		printk(KERN_INFO "btaudio: registered device dsp%d [digital]\n",
 		       bta->dsp_digital >> 4);
@@ -991,7 +995,7 @@ static int __devinit btaudio_probe(struc
 		if (rc < 0) {
 			printk(KERN_WARNING
 			       "btaudio: can't register analog dsp (rc=%d)\n",rc);
-			goto fail3;
+			goto fail4;
 		}
 		printk(KERN_INFO "btaudio: registered device dsp%d [analog]\n",
 		       bta->dsp_analog >> 4);
@@ -999,7 +1003,7 @@ static int __devinit btaudio_probe(struc
 		if (rc < 0) {
 			printk(KERN_WARNING
 			       "btaudio: can't register mixer (rc=%d)\n",rc);
-			goto fail4;
+			goto fail5;
 		}
 		printk(KERN_INFO "btaudio: registered device mixer%d\n",
 		       bta->mixer_dev >> 4);
@@ -1012,13 +1016,15 @@ static int __devinit btaudio_probe(struc
 	pci_set_drvdata(pci_dev,bta);
         return 0;
 
- fail4:
+ fail5:
 	unregister_sound_dsp(bta->dsp_analog);
- fail3:
+ fail4:
 	if (digital)
 		unregister_sound_dsp(bta->dsp_digital);
- fail2:
-        free_irq(bta->irq,bta);	
+ fail3:	
+	free_irq(bta->irq,bta);
+ fail2:        
+	iounmap(bta->mmio);
  fail1:
 	kfree(bta);
  fail0:
@@ -1047,6 +1053,8 @@ static void __devexit btaudio_remove(str
 	}
 
 	/* free resources */
+	if (bta->mmio)
+		iounmap(bta->mmio);
 	free_buffer(bta);
         free_irq(bta->irq,bta);
 	release_mem_region(pci_resource_start(pci_dev,0),

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors