Skip to contentSkip to conversation

staging: ft1000: fix skb, netdev, memory leaks

PATCH In review Vasiliy Kulikov 3 participants 4 messages Sep 28, 2010 – Sep 30, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: ft1000: fix skb, netdev, memory leaks

ft1000_copy_up_pkt() doesn't free skb on errors. init_ft1000_card() doesn't free netdev with free_netdev() but with kfree(). init_ft1000_card() doesn't check request_region()'s return value and doesn't free region on error.

---
Compile tested.

 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c |   32 +++++++++++++--------
 1 files changed, 20 insertions(+), 12 deletions(-)
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +20 -12
index a6ba84c..eed7e94 100644
@@ -1686,6 +1686,7 @@ int ft1000_copy_up_pkt(struct net_device *dev)
 			  tempword);
 		ft1000_flush_fifo(dev, DSP_PKTPHCKSUM_INFO);
 		info->stats.rx_errors++;
+		kfree_skb(skb);
 		return FAILURE;
 	}
 	//subtract the number of bytes read already
@@ -1711,6 +1712,7 @@ int ft1000_copy_up_pkt(struct net_device *dev)
 			*pbuffer++ = (u8) (tempword >> 8);
 			*pbuffer++ = (u8) tempword;
 			if (ft1000_chkcard(dev) = FALSE) {
+				kfree_skb(skb);
 				return FAILURE;
 			}
 		}
@@ -2236,15 +2238,17 @@ struct net_device *init_ft1000_card(unsigned short irq, int port,
 
 	if (request_irq(dev->irq, ft1000_interrupt, IRQF_SHARED, dev->name, dev)) {
 		printk(KERN_ERR "ft1000: Could not request_irq\n");
-		kfree(dev);
-		return (NULL);
+		goto err_dev;
 	}
 
-	request_region(dev->base_addr, 256, dev->name);
+	if (request_region(dev->base_addr, 256, dev->name) = NULL) {
+		printk(KERN_ERR "ft1000: Could not request_region\n");
+		goto err_irq;
+	}
 
 	if (register_netdev(dev) != 0) {
 		DEBUG(0, "ft1000: Could not register netdev");
-		return NULL;
+		goto err_reg;
 	}
 
 	info->AsicID = ft1000_read_reg(dev, FT1000_REG_ASIC_ID);
@@ -2252,19 +2256,13 @@ struct net_device *init_ft1000_card(unsigned short irq, int port,
 		DEBUG(0, "ft1000_hw: ELECTRABUZZ ASIC\n");
 		if (request_firmware(&fw_entry, "ft1000.img", fdev) != 0) {
 			printk(KERN_INFO "ft1000: Could not open ft1000.img\n");
-			unregister_netdev(dev);
-			free_irq(dev->irq, dev);
-			kfree(dev);
-			return NULL;
+			goto err_unreg;
 		}
 	} else {
 		DEBUG(0, "ft1000_hw: MAGNEMITE ASIC\n");
 		if (request_firmware(&fw_entry, "ft2000.img", fdev) != 0) {
 			printk(KERN_INFO "ft1000: Could not open ft2000.img\n");
-			unregister_netdev(dev);
-			free_irq(dev->irq, dev);
-			kfree(dev);
-			return NULL;
+			goto err_unreg;
 		}
 	}
 
@@ -2279,6 +2277,16 @@ struct net_device *init_ft1000_card(unsigned short irq, int port,
 		   dev->dev_addr[1], dev->dev_addr[2], dev->dev_addr[3],
 		   dev->dev_addr[4], dev->dev_addr[5]);
 	return dev;
+
+err_unreg:
+	unregister_netdev(dev);
+err_reg:
+	release_region(dev->base_addr, 256);
+err_irq:
+	free_irq(dev->irq, dev);
+err_dev:
+	free_netdev(dev);
+	return NULL;
 }
 
 EXPORT_SYMBOL(init_ft1000_card);
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 8 lines · Vasiliy Kulikov

ft1000_copy_up_pkt() doesn't free skb on errors. init_ft1000_card() doesn't free netdev with free_netdev() but with kfree(). init_ft1000_card() doesn't check request_region()'s return value and doesn't free region on error.

---
Compile tested.

No you didn't

Quoted 2 lines
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c |   32 +++++++++++++--------
 1 files changed, 20 insertions(+), 12 deletions(-)

This file doesn't build at this point in time, how did you build test this?

I don't mind taking the patch, but please, don't lie.

thanks,

greg k-h

#2 lore raw
Quoted 11 lines · Greg KH
Quoted 8 lines · Vasiliy Kulikov

ft1000_copy_up_pkt() doesn't free skb on errors. init_ft1000_card() doesn't free netdev with free_netdev() but with kfree(). init_ft1000_card() doesn't check request_region()'s return value and doesn't free region on error.

---
Compile tested.

No you didn't

No I did:

make -C /home/vasya/linux drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.o
make: Вход в каталог `/home/vasya/dev/linux-next'

  CHK     include/linux/version.h
  CHK     include/generated/utsrelease.h
  CALL    scripts/checksyscalls.sh
  CC      drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.o

drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c: In function ‘ft1000_reset_card’:
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c:525: warning: passing argument 2 of ‘card_download’ discards qualifiers from pointer target type drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c:56: note: expected ‘void *’ but argument is of type ‘const u8 * const’
make: Выход из каталога `/home/vasya/dev/linux-next'

However,

    cd ../drivers/staging/ft1000/ft1000-pcmcia/
    LANG=C make -C ~/linux ft1000_hw.o
    make: Entering directory `/home/vasya/dev/linux-next'
    make: *** No rule to make target `ft1000_hw.o'.  Stop.
    make: Leaving directory `/home/vasya/dev/linux-next'

Is "make" from linux root buggy/not supported for staging/everything?

Quoted 12 lines
Quoted 3 lines
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c |   32 +++++++++++++--------
 1 files changed, 20 insertions(+), 12 deletions(-)

This file doesn't build at this point in time, how did you build test this?

I don't mind taking the patch, but please, don't lie.

thanks,

greg k-h

Signature · 1 line
Vasiliy
#3 lore raw
Quoted 17 lines · Vasiliy Kulikov
Quoted 11 lines · Greg KH
Quoted 8 lines · Vasiliy Kulikov

ft1000_copy_up_pkt() doesn't free skb on errors. init_ft1000_card() doesn't free netdev with free_netdev() but with kfree(). init_ft1000_card() doesn't check request_region()'s return value and doesn't free region on error.

---
Compile tested.

No you didn't

No I did:

make -C /home/vasya/linux drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.o
make: Вход в каталог `/home/vasya/dev/linux-next'

Quoted 8 lines
  CHK     include/linux/version.h
  CHK     include/generated/utsrelease.h
  CALL    scripts/checksyscalls.sh
  CC      drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.o

drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c: In function ‘ft1000_reset_card’:
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c:525: warning: passing argument 2 of ‘card_download’ discards qualifiers from pointer target type drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c:56: note: expected ‘void *’ but argument is of type ‘const u8 * const’
make: Выход из каталога `/home/vasya/dev/linux-next'

Heh, I didn't think to try that, amazed that it worked at all.

Quoted 10 lines

However,

    cd ../drivers/staging/ft1000/ft1000-pcmcia/
    LANG=C make -C ~/linux ft1000_hw.o
    make: Entering directory `/home/vasya/dev/linux-next'
    make: *** No rule to make target `ft1000_hw.o'.  Stop.
    make: Leaving directory `/home/vasya/dev/linux-next'

Is "make" from linux root buggy/not supported for staging/everything?

This driver is marked broken, look at the Kconfig file:

	config FT1000_PCMCIA
	        tristate "Driver for ft1000 pcmcia device."
	        depends on PCMCIA && BROKEN

It will be fixed up soon hopefully.

thanks,

greg k-h