Skip to contentSkip to conversation

Check if skb_alloc returns Null in function fw_download_code

PATCH Superseded Nicholas Krause 4 participants 4 messages Jun 17, 2014 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Check if skb_alloc returns Null in function fw_download_code

---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +2 -0
index 1a95d1f..11e915e 100644
@@ -61,11 +61,13 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 		}
 
 		skb  = dev_alloc_skb(frag_length + 4);
+		if (!skb) {
 		memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
 		tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
 		tcb_desc->queue_index = TXCMD_QUEUE;
 		tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;
 		tcb_desc->bLastIniPkt = bLastIniPkt;
+		}
 
 		seg_ptr = skb->data;
 		for (i = 0; i < frag_length; i += 4) {
Signature · 1 line
1.9.1
maintainer
#1 lore raw
Quoted 11 lines · Nicholas Krause
---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +0 -0
index 1a95d1f..11e915e 100644
@@ -61,11 +61,13 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 		}

drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, · line 71

Quoted 10 lines
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +2 -0
 
 		skb  = dev_alloc_skb(frag_length + 4);
+		if (!skb) {
 		memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
 		tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
 		tcb_desc->queue_index = TXCMD_QUEUE;
 		tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;
 		tcb_desc->bLastIniPkt = bLastIniPkt;
+		}
 

Please run your patches through scripts/checkpatch.pl to find the errors before sending them out and having someone else point them out to you...

thanks,

greg k-h

#2 lore raw
Quoted 13 lines · Greg KH
Quoted 12 lines · Nicholas Krause
---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +0 -0
index 1a95d1f..11e915e 100644
@@ -61,11 +61,13 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 		}
 
Quoted 12 lines

drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, · line 71

Quoted 9 lines
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +2 -0
 		skb  = dev_alloc_skb(frag_length + 4);
+		if (!skb) {
 		memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
 		tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
 		tcb_desc->queue_index = TXCMD_QUEUE;
 		tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;
 		tcb_desc->bLastIniPkt = bLastIniPkt;
+		}
 

Please run your patches through scripts/checkpatch.pl to find the errors before sending them out and having someone else point them out to you...

I suspect checkpatch would pick up the indentation mess, but indentation is the least of this patch's problems.

if that alloc_skb fails, going around the loop again is pointless, and harmful. (we'll oops right below that added bracket).

on failure, this should be returning 0 so that the caller handles the failure appropriately.

Dave

#3 lore raw
In reply to Nicholas Krause
Quoted 10 lines · Nicholas Krause
---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +0 -0
index 1a95d1f..11e915e 100644

drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, · line 64

Quoted 4 lines
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +1 -0
@@ -61,11 +61,13 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 		}
 
 		skb  = dev_alloc_skb(frag_length + 4);
+		if (!skb) {

This test is reversed and causes a NULL dereference on the next line.

regards,
dan carpenter

Quoted 16 lines
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +1 -0
 		memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
 		tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
 		tcb_desc->queue_index = TXCMD_QUEUE;
 		tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;
 		tcb_desc->bLastIniPkt = bLastIniPkt;
+		}
 
 		seg_ptr = skb->data;
 		for (i = 0; i < frag_length; i += 4) {
Signature · 6 lines
1.9.1

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel