Skip to contentSkip to conversation

staging: rtl8192 Check for Null return from dev_skb_alloc

PATCH In review Nicholas Krause 1 participant 3 messages Jun 19, 2014 – Jun 20, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8192 Check for Null return from dev_skb_alloc

Checks for Null return from dev_skb_alloc if it returns Null, fw_download returns false. Otherwise it returns true.Also removed rt_status due to returning true of false directly.

---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +3 -2
index 1a95d1f..affa89a 100644
@@ -36,7 +36,6 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 			     u32 buffer_len)
 {
 	struct r8192_priv *priv = rtllib_priv(dev);
-	bool		    rt_status = true;
 	u16		    frag_threshold;
 	u16		    frag_length, frag_offset = 0;
 	int		    i;
@@ -59,7 +58,9 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 			bLastIniPkt = 1;
 
 		}
       skb  = dev_alloc_skb(frag_length + 4);
+		if (!skb)
+			return false;
 		memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
 		tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
@@ -99,7 +100,7 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 
 	write_nic_byte(dev, TPPoll, TPPoll_CQ);
 
-	return rt_status;
+	return true;
 }
 
 static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
Signature · 1 line
1.9.1
#1 lore raw

If anyone able to check this patch it would be great. Thanks Nick

Quoted 42 lines · Nicholas Krause

Checks for Null return from dev_skb_alloc if it returns Null, fw_download returns false. Otherwise it returns true.Also removed rt_status due to returning true of false directly.

---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +3 -3
index 1a95d1f..affa89a 100644
@@ -36,7 +36,6 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
                             u32 buffer_len)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
-       bool                rt_status = true;
        u16                 frag_threshold;
        u16                 frag_length, frag_offset = 0;
        int                 i;
@@ -59,7 +58,9 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
                        bLastIniPkt = 1;
 
                }
       skb  = dev_alloc_skb(frag_length + 4);
+               if (!skb)
+                       return false;
                memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
                tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
@@ -99,7 +100,7 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 
        write_nic_byte(dev, TPPoll, TPPoll_CQ);
 
-       return rt_status;
+       return true;
 }
 
 static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
--

1.9.1

#2 lore raw

Our you Guys just removing me from your emails I have checked this patch and it seems right. If you don't want to accept it , the less you can do is give me a reply.
Nick

Quoted 46 lines · Nick Krause

If anyone able to check this patch it would be great. Thanks Nick

Quoted 42 lines · Nicholas Krause

Checks for Null return from dev_skb_alloc if it returns Null, fw_download returns false. Otherwise it returns true.Also removed rt_status due to returning true of false directly.

---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +3 -3
index 1a95d1f..affa89a 100644
@@ -36,7 +36,6 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
                             u32 buffer_len)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
-       bool                rt_status = true;
        u16                 frag_threshold;
        u16                 frag_length, frag_offset = 0;
        int                 i;
@@ -59,7 +58,9 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
                        bLastIniPkt = 1;
 
                }
       skb  = dev_alloc_skb(frag_length + 4);
+               if (!skb)
+                       return false;
                memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
                tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
@@ -99,7 +100,7 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
 
        write_nic_byte(dev, TPPoll, TPPoll_CQ);
 
-       return rt_status;
+       return true;
 }
 
 static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
--

1.9.1