[KJ] [PATCH] [RESEND] Audit return code : drivers/char/applicom.c

[KJ] [PATCH] [RESEND] Audit return code : drivers/char/applicom.c

[Christophe Lucas]

[-- Attachment #1: Type: text/plain, Size: 1777 bytes --]

description:
Audit return codes (and handle failure correctly) for misc_register.
"unsigned int" is preferred to "int".

Signed-off-by: Christophe Lucas <clucas@rotomalug.org>


diff -urpNX dontdiff 2.6.12-orig/drivers/char/applicom.c 2.6.12/drivers/char/applicom.c
--- 2.6.12-orig/drivers/char/applicom.c	2005-06-17 21:48:29.000000000 +0200
+++ 2.6.12/drivers/char/applicom.c	2005-06-22 08:55:52.000000000 +0200
@@ -172,7 +172,7 @@ static int ac_register_board(unsigned lo
 
 void cleanup_module(void)
 {
-	int i;
+	unsigned int i;
 
 	misc_deregister(&ac_miscdev);
 
@@ -195,7 +195,7 @@ int __init applicom_init(void)
 	int i, numisa = 0;
 	struct pci_dev *dev = NULL;
 	void __iomem *RamIO;
-	int boardno;
+	int boardno, ret;
 
 	printk(KERN_INFO "Applicom driver: $Id: ac.c,v 1.30 2000/03/22 16:03:57 dwmw2 Exp $\n");
 
@@ -294,7 +294,7 @@ int __init applicom_init(void)
 	}
 
 	if (!numisa)
-		printk(KERN_WARNING"ac.o: No valid ISA Applicom boards found at mem 0x%lx\n",mem);
+		printk(KERN_WARNING "ac.o: No valid ISA Applicom boards found at mem 0x%lx\n",mem);
 
  fin:
 	init_waitqueue_head(&FlagSleepRec);
@@ -304,7 +304,11 @@ int __init applicom_init(void)
 	DeviceErrorCount = 0;
 
 	if (numboards) {
-		misc_register(&ac_miscdev);
+		ret = misc_register(&ac_miscdev);
+		if (ret) {
+			printk(KERN_WARNING "Unable to register misc device\n");
+			goto out;
+		}
 		for (i = 0; i < MAX_BOARD; i++) {
 			int serial;
 			char boardname[(SERIAL_NUMBER - TYPE_CARD) + 1];
@@ -337,6 +341,17 @@ int __init applicom_init(void)
 
 	else
 		return -ENXIO;
+
+out:
+	for (i = 0 ; i < MAX_BOARD ; i++) {
+		if (apbs[i].RamIO)
+			continue;
+		if (apbs[i].irq)
+			free_irq(apbs[i].irq, &dummy);
+		iounmap(apbs[i].RamIO);
+	}
+	pci_disable_device(dev);
+	return ret ;
 }
 
 

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

[KJ] [PATCH] [RESEND] Audit return code : drivers/char/lcd.c

[Christophe Lucas]

[-- Attachment #1: Type: text/plain, Size: 773 bytes --]

description:
Audit return codes (and handle failure correctly) for misc_register.

Signed-off-by: Christophe Lucas <clucas@rotomalug.org>


diff -urpNX dontdiff 2.6.12-orig/drivers/char/lcd.c 2.6.12/drivers/char/lcd.c
--- 2.6.12-orig/drivers/char/lcd.c	2005-06-17 21:48:29.000000000 +0200
+++ 2.6.12/drivers/char/lcd.c	2005-06-22 08:56:54.000000000 +0200
@@ -613,10 +613,15 @@ static struct miscdevice lcd_dev = {
 
 static int lcd_init(void)
 {
+	int ret ;
 	unsigned long data;
 
 	pr_info("%s\n", LCD_DRIVER);
-	misc_register(&lcd_dev);
+	ret = misc_register(&lcd_dev);
+	if (ret) {
+		printk(KERN_WARNING "Unable to register misc device.\n");
+		return ret ;
+	}
 
 	/* Check region? Naaah! Just snarf it up. */
 /*	request_region(RTC_PORT(0), RTC_IO_EXTENT, "lcd");*/

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] [RESEND] Audit return code : drivers/char/lcd.c

[randy_dunlap]

[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

On Wed, 22 Jun 2005 09:56:33 +0200 Christophe Lucas wrote:

| description:
| Audit return codes (and handle failure correctly) for misc_register.
| 
| Signed-off-by: Christophe Lucas <clucas@rotomalug.org>
| 
| 
| diff -urpNX dontdiff 2.6.12-orig/drivers/char/lcd.c 2.6.12/drivers/char/lcd.c
| --- 2.6.12-orig/drivers/char/lcd.c	2005-06-17 21:48:29.000000000 +0200
| +++ 2.6.12/drivers/char/lcd.c	2005-06-22 08:56:54.000000000 +0200
| @@ -613,10 +613,15 @@ static struct miscdevice lcd_dev = {
|  
|  static int lcd_init(void)
|  {
| +	int ret ;

No space before the ';'.

|  	unsigned long data;
|  
|  	pr_info("%s\n", LCD_DRIVER);
| -	misc_register(&lcd_dev);
| +	ret = misc_register(&lcd_dev);
| +	if (ret) {
| +		printk(KERN_WARNING "Unable to register misc device.\n");
| +		return ret ;

Repeating:  don't put a space before the ';'.

| +	}
|  
|  	/* Check region? Naaah! Just snarf it up. */
|  /*	request_region(RTC_PORT(0), RTC_IO_EXTENT, "lcd");*/
| 


---
~Randy

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] [RESEND] Audit return code : drivers/char/applicom.c

[randy_dunlap]

[-- Attachment #1: Type: text/plain, Size: 2162 bytes --]

On Wed, 22 Jun 2005 09:53:13 +0200 Christophe Lucas wrote:

| description:
| Audit return codes (and handle failure correctly) for misc_register.
| "unsigned int" is preferred to "int".

Did it make any difference in the generated (compiled) code?

| Signed-off-by: Christophe Lucas <clucas@rotomalug.org>
| 
| 
| diff -urpNX dontdiff 2.6.12-orig/drivers/char/applicom.c 2.6.12/drivers/char/applicom.c
| --- 2.6.12-orig/drivers/char/applicom.c	2005-06-17 21:48:29.000000000 +0200
| +++ 2.6.12/drivers/char/applicom.c	2005-06-22 08:55:52.000000000 +0200
| @@ -172,7 +172,7 @@ static int ac_register_board(unsigned lo
|  
|  void cleanup_module(void)
|  {
| -	int i;
| +	unsigned int i;
|  
|  	misc_deregister(&ac_miscdev);
|  
| @@ -195,7 +195,7 @@ int __init applicom_init(void)
|  	int i, numisa = 0;
|  	struct pci_dev *dev = NULL;
|  	void __iomem *RamIO;
| -	int boardno;
| +	int boardno, ret;
|  
|  	printk(KERN_INFO "Applicom driver: $Id: ac.c,v 1.30 2000/03/22 16:03:57 dwmw2 Exp $\n");
|  
| @@ -294,7 +294,7 @@ int __init applicom_init(void)
|  	}
|  
|  	if (!numisa)
| -		printk(KERN_WARNING"ac.o: No valid ISA Applicom boards found at mem 0x%lx\n",mem);
| +		printk(KERN_WARNING "ac.o: No valid ISA Applicom boards found at mem 0x%lx\n",mem);
|  
|   fin:
|  	init_waitqueue_head(&FlagSleepRec);
| @@ -304,7 +304,11 @@ int __init applicom_init(void)
|  	DeviceErrorCount = 0;
|  
|  	if (numboards) {
| -		misc_register(&ac_miscdev);
| +		ret = misc_register(&ac_miscdev);
| +		if (ret) {
| +			printk(KERN_WARNING "Unable to register misc device\n");

This message needs a prefix added to it (like "ac.o: ") so that users
will know where it's coming from...

| +			goto out;
| +		}
|  		for (i = 0; i < MAX_BOARD; i++) {
|  			int serial;
|  			char boardname[(SERIAL_NUMBER - TYPE_CARD) + 1];
| @@ -337,6 +341,17 @@ int __init applicom_init(void)
|  
|  	else
|  		return -ENXIO;
| +
| +out:
| +	for (i = 0 ; i < MAX_BOARD ; i++) {
| +		if (apbs[i].RamIO)
| +			continue;
| +		if (apbs[i].irq)
| +			free_irq(apbs[i].irq, &dummy);
| +		iounmap(apbs[i].RamIO);
| +	}
| +	pci_disable_device(dev);
| +	return ret ;

	return ret;

|  }



---
~Randy

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] [RESEND] Audit return code : drivers/char/lcd.c

[randy_dunlap]

[-- Attachment #1: Type: text/plain, Size: 891 bytes --]

On Wed, 22 Jun 2005 09:56:33 +0200 Christophe Lucas wrote:

| description:
| Audit return codes (and handle failure correctly) for misc_register.
| 
| Signed-off-by: Christophe Lucas <clucas@rotomalug.org>
| 
| 
| diff -urpNX dontdiff 2.6.12-orig/drivers/char/lcd.c 2.6.12/drivers/char/lcd.c
| --- 2.6.12-orig/drivers/char/lcd.c	2005-06-17 21:48:29.000000000 +0200
| +++ 2.6.12/drivers/char/lcd.c	2005-06-22 08:56:54.000000000 +0200
| @@ -613,10 +613,15 @@ static struct miscdevice lcd_dev = {
|  
|  static int lcd_init(void)
|  {
| +	int ret ;
|  	unsigned long data;
|  
|  	pr_info("%s\n", LCD_DRIVER);
| -	misc_register(&lcd_dev);
| +	ret = misc_register(&lcd_dev);
| +	if (ret) {
| +		printk(KERN_WARNING "Unable to register misc device.\n");
| +		return ret ;
| +	}

The printk message needs some module identification in it so
that users can know where it's coming from.

---
~Randy

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

[KJ] [PATCH] [RESEND] Audit return code : drivers/char/applicom.c

[Christophe Lucas]

[-- Attachment #1: Type: text/plain, Size: 1788 bytes --]

description:
 o Audit return codes (and handle failure correctly) for misc_register.
 o "unsigned int" is preferred to "int".

Signed-off-by: Christophe Lucas <clucas@rotomalug.org>


diff -urpNX dontdiff 2.6.12-orig/drivers/char/applicom.c 2.6.12/drivers/char/applicom.c
--- 2.6.12-orig/drivers/char/applicom.c	2005-06-17 21:48:29.000000000 +0200
+++ 2.6.12/drivers/char/applicom.c	2005-06-23 09:05:34.513902824 +0200
@@ -172,7 +172,7 @@ static int ac_register_board(unsigned lo
 
 void cleanup_module(void)
 {
-	int i;
+	unsigned int i;
 
 	misc_deregister(&ac_miscdev);
 
@@ -195,7 +195,7 @@ int __init applicom_init(void)
 	int i, numisa = 0;
 	struct pci_dev *dev = NULL;
 	void __iomem *RamIO;
-	int boardno;
+	int boardno, ret;
 
 	printk(KERN_INFO "Applicom driver: $Id: ac.c,v 1.30 2000/03/22 16:03:57 dwmw2 Exp $\n");
 
@@ -294,7 +294,7 @@ int __init applicom_init(void)
 	}
 
 	if (!numisa)
-		printk(KERN_WARNING"ac.o: No valid ISA Applicom boards found at mem 0x%lx\n",mem);
+		printk(KERN_WARNING "ac.o: No valid ISA Applicom boards found at mem 0x%lx\n",mem);
 
  fin:
 	init_waitqueue_head(&FlagSleepRec);
@@ -304,7 +304,11 @@ int __init applicom_init(void)
 	DeviceErrorCount = 0;
 
 	if (numboards) {
-		misc_register(&ac_miscdev);
+		ret = misc_register(&ac_miscdev);
+		if (ret) {
+			printk(KERN_WARNING "ac.o: Unable to register misc device\n");
+			goto out;
+		}
 		for (i = 0; i < MAX_BOARD; i++) {
 			int serial;
 			char boardname[(SERIAL_NUMBER - TYPE_CARD) + 1];
@@ -337,6 +341,17 @@ int __init applicom_init(void)
 
 	else
 		return -ENXIO;
+
+out:
+	for (i = 0 ; i < MAX_BOARD ; i++) {
+		if (apbs[i].RamIO)
+			continue;
+		if (apbs[i].irq)
+			free_irq(apbs[i].irq, &dummy);
+		iounmap(apbs[i].RamIO);
+	}
+	pci_disable_device(dev);
+	return ret;
 }
 
 

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] [RESEND] Audit return code : drivers/char/lcd.c

[Christophe Lucas]

[-- Attachment #1: Type: text/plain, Size: 775 bytes --]

description:
Audit return codes (and handle failure correctly) for misc_register.

Signed-off-by: Christophe Lucas <clucas@rotomalug.org>


diff -urpNX dontdiff 2.6.12-orig/drivers/char/lcd.c 2.6.12/drivers/char/lcd.c
--- 2.6.12-orig/drivers/char/lcd.c	2005-06-17 21:48:29.000000000 +0200
+++ 2.6.12/drivers/char/lcd.c	2005-06-23 09:07:42.124503064 +0200
@@ -613,10 +613,15 @@ static struct miscdevice lcd_dev = {
 
 static int lcd_init(void)
 {
+	int ret;
 	unsigned long data;
 
 	pr_info("%s\n", LCD_DRIVER);
-	misc_register(&lcd_dev);
+	ret = misc_register(&lcd_dev);
+	if (ret) {
+		printk(KERN_WARNING LCD "Unable to register misc device.\n");
+		return ret;
+	}
 
 	/* Check region? Naaah! Just snarf it up. */
 /*	request_region(RTC_PORT(0), RTC_IO_EXTENT, "lcd");*/

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] [RESEND] Audit return code : drivers/char/applicom.c

[Felipe W Damasio]

    Hi Chistophe,

Christophe Lucas wrote:

>+out:
>+	for (i = 0 ; i < MAX_BOARD ; i++) {
>+		if (apbs[i].RamIO)
>+			continue;
>  
>

    I don't get this. Isn't it supposed to be:

    if (!apbs[i].RamIO)

    ?

    If you pass apps[i].RamIO to iounmap only when it's set to NULL
you'll always get a "__iounmap: bad address", right?

    Cheers,

Felipe Damasio
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] [RESEND] Audit return code : drivers/char/applicom.c

[Christophe Lucas]

[-- Attachment #1: Type: text/plain, Size: 1745 bytes --]

description:
Audit return codes (and handle failure correctly) for misc_register.

Signed-off-by: Christophe Lucas <clucas@rotomalug.org>


diff -urpNX dontdiff 2.6.12-orig/drivers/char/applicom.c 2.6.12/drivers/char/applicom.c
--- 2.6.12-orig/drivers/char/applicom.c	2005-06-17 21:48:29.000000000 +0200
+++ 2.6.12/drivers/char/applicom.c	2005-06-23 10:42:41.091128448 +0200
@@ -172,7 +172,7 @@ static int ac_register_board(unsigned lo
 
 void cleanup_module(void)
 {
-	int i;
+	unsigned int i;
 
 	misc_deregister(&ac_miscdev);
 
@@ -195,7 +195,7 @@ int __init applicom_init(void)
 	int i, numisa = 0;
 	struct pci_dev *dev = NULL;
 	void __iomem *RamIO;
-	int boardno;
+	int boardno, ret;
 
 	printk(KERN_INFO "Applicom driver: $Id: ac.c,v 1.30 2000/03/22 16:03:57 dwmw2 Exp $\n");
 
@@ -294,7 +294,7 @@ int __init applicom_init(void)
 	}
 
 	if (!numisa)
-		printk(KERN_WARNING"ac.o: No valid ISA Applicom boards found at mem 0x%lx\n",mem);
+		printk(KERN_WARNING "ac.o: No valid ISA Applicom boards found at mem 0x%lx\n",mem);
 
  fin:
 	init_waitqueue_head(&FlagSleepRec);
@@ -304,7 +304,11 @@ int __init applicom_init(void)
 	DeviceErrorCount = 0;
 
 	if (numboards) {
-		misc_register(&ac_miscdev);
+		ret = misc_register(&ac_miscdev);
+		if (ret) {
+			printk(KERN_WARNING "ac.o: Unable to register misc device\n");
+			goto out;
+		}
 		for (i = 0; i < MAX_BOARD; i++) {
 			int serial;
 			char boardname[(SERIAL_NUMBER - TYPE_CARD) + 1];
@@ -337,6 +341,17 @@ int __init applicom_init(void)
 
 	else
 		return -ENXIO;
+
+out:
+	for (i = 0 ; i < MAX_BOARD ; i++) {
+		if (!apbs[i].RamIO)
+			continue;
+		if (apbs[i].irq)
+			free_irq(apbs[i].irq, &dummy);
+		iounmap(apbs[i].RamIO);
+	}
+	pci_disable_device(dev);
+	return ret;
 }
 
 

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors