[PATCH] r8169: Fix iteration variable sign

[PATCH] r8169: Fix iteration variable sign

[Michael Buesch]

This changes the type of variable "i" in
rtl8169_init_one() from "unsigned int" to "int".
"i" is checked for <0 later, which can never happen
for "unsigned". This results in broken error handling.

Signed-off-by: Michael Buesch <mb@bu3sch.de>

Index: linux-2.6/drivers/net/r8169.c
===================================================================
--- linux-2.6.orig/drivers/net/r8169.c	2006-11-04 19:03:28.000000000 +0100
+++ linux-2.6/drivers/net/r8169.c	2006-11-29 20:41:59.000000000 +0100
@@ -1473,8 +1473,8 @@ rtl8169_init_one(struct pci_dev *pdev, c
 	struct rtl8169_private *tp;
 	struct net_device *dev;
 	void __iomem *ioaddr;
-	unsigned int i, pm_cap;
-	int rc;
+	unsigned int pm_cap;
+	int i, rc;
 
 	if (netif_msg_drv(&debug)) {
 		printk(KERN_INFO "%s Gigabit Ethernet driver %s loaded\n",

-- 
Greetings Michael.

[PATCH] r8169: Fix iteration variable sign

[Francois Romieu]

This changes the type of variable "i" in rtl8169_init_one()
from "unsigned int" to "int". "i" is checked for < 0 later,
which can never happen for "unsigned". This results in broken
error handling.
    
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 5002673..c8fa9b1 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1491,8 +1491,8 @@ rtl8169_init_one(struct pci_dev *pdev, c
 	struct rtl8169_private *tp;
 	struct net_device *dev;
 	void __iomem *ioaddr;
-	unsigned int i, pm_cap;
-	int rc;
+	unsigned int pm_cap;
+	int i, rc;
 
 	if (netif_msg_drv(&debug)) {
 		printk(KERN_INFO "%s Gigabit Ethernet driver %s loaded\n",

Re: [PATCH] r8169: Fix iteration variable sign

[Jeff Garzik]

Francois Romieu wrote:
> This changes the type of variable "i" in rtl8169_init_one()
> from "unsigned int" to "int". "i" is checked for < 0 later,
> which can never happen for "unsigned". This results in broken
> error handling.
>     
> Signed-off-by: Michael Buesch <mb@bu3sch.de>
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

ACK but doesn't seem to apply to 2.6.19?

should this go into #upstream rather than #upstream-fixes?

Re: [PATCH] r8169: Fix iteration variable sign

[Michael Buesch]

On Thursday 30 November 2006 12:20, Jeff Garzik wrote:
> Francois Romieu wrote:
> > This changes the type of variable "i" in rtl8169_init_one()
> > from "unsigned int" to "int". "i" is checked for < 0 later,
> > which can never happen for "unsigned". This results in broken
> > error handling.
> >     
> > Signed-off-by: Michael Buesch <mb@bu3sch.de>
> > Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
> 
> ACK but doesn't seem to apply to 2.6.19?
> 
> should this go into #upstream rather than #upstream-fixes?

Hm, I did this against latest linus' tree.

-- 
Greetings Michael.

Re: [PATCH] r8169: Fix iteration variable sign

[Francois Romieu]

Jeff Garzik <jgarzik@pobox.com> :
[...]
> should this go into #upstream rather than #upstream-fixes?

It's already in.

The attribution does not follow the ordering of the Signed-off-by
but the S-o-b are fine.

-- 
Ueimor