Skip to contentSkip to conversation

Checks for Null return of skb_alloc in function fw_download_code

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

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Checks for Null return of skb_alloc in function fw_download_code

---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +5 -1
index 11e915e..fde17ff 100644
@@ -62,12 +62,15 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 
 		skb  = dev_alloc_skb(frag_length + 4);
+		if (!skb) {
+				rt_status = false;
+				return rt_status;
+
+		}
 		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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +0 -0
index 11e915e..fde17ff 100644

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

Quoted 7 lines
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +5 -0
@@ -62,12 +62,15 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 
 		skb  = dev_alloc_skb(frag_length + 4);
+		if (!skb) {
+				rt_status = false;
+				return rt_status;
+
+		}

Why 2 tabs for indentation? Does that look correct?

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

Quoted 9 lines
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +0 -1
 		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) {

Also, this patch still fails to apply, what tree did you make it against? A "clean" 3.16-rc1 tree, or your own tree with other changes in it?

greg k-h

#2 lore raw

So sorry Greg,
I pulled the git in this morning for kernel-3.16-r2 ,I will resend the patch from the clean tree.
I will also fix the tabs.'
Sorry :( Nick

Quoted 36 lines · Greg KH
Quoted 10 lines · Nicholas Krause
---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +0 -0
index 11e915e..fde17ff 100644

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

Quoted 7 lines
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +5 -0
@@ -62,12 +62,15 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 
              skb  = dev_alloc_skb(frag_length + 4);
+             if (!skb) {
+                             rt_status = false;
+                             return rt_status;
+
+             }

Why 2 tabs for indentation? Does that look correct?

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

Quoted 9 lines
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +0 -1
              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) {

Also, this patch still fails to apply, what tree did you make it against? A "clean" 3.16-rc1 tree, or your own tree with other changes in it?

greg k-h