Skip to contentSkip to conversation

Fixes no Null check of dev_skb_alloc in fw_download_code

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

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fixes no Null check of dev_skb_alloc in fw_download_code

---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +4 -0
index 1a95d1f..1a90546 100644
@@ -61,6 +61,10 @@ 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;
Signature · 1 line
1.9.1
maintainer
#1 lore raw
Quoted 4 lines · Nicholas Krause
---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 4 ++++
 1 file changed, 4 insertions(+)

Some more meta-comments. Your subject: should give people a clue as to where in the kernel you are changing. This patch would be:
Subject: staging: rtl8192e: check return value of dev_skb_alloc

And then in the body of the patch changelog area, explain why you are doing this.

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

Quoted 13 lines
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +4 -0
index 1a95d1f..1a90546 100644
@@ -61,6 +61,10 @@ 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;
+		}

Does that really look like the correct thing to be doing here? Surely you can delete 2 lines of this patch, right?

thanks,

greg k-h