Skip to contentSkip to conversation

Check if skb_alloc returns Null in function fw_download_code

PATCH In review Nicholas Krause 2 participants 2 messages Jun 17, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 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)
+			return 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 · 1 line
1.9.1
maintainer
#1 lore raw
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 67

Quoted 7 lines
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +2 -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)
+			return 0;
 			memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
 			tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);

Again, look at this code and tell me if it now looks correct after your change...

thanks,

greg k-h