[PATCHv2] Check if skb_alloc returns Null in function fw_download_code

[PATCHv2] Check if skb_alloc returns Null in function fw_download_code

[Nicholas Krause]

Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
index 1a95d1f..11e915e 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
@@ -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) {
-- 
1.9.1

Re: [PATCHv2] Check if skb_alloc returns Null in function fw_download_code

[Greg KH]

On Tue, Jun 17, 2014 at 12:07:12PM -0400, Nicholas Krause wrote:
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
>  drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> index 1a95d1f..11e915e 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> @@ -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

[PATCHv2] Check if skb_alloc returns Null in function fw_download_code

[Nicholas Krause]

Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
 drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
index 1a95d1f..11e915e 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
@@ -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) {
-- 
1.9.1

Re: [PATCHv2] Check if skb_alloc returns Null in function fw_download_code

[Greg KH]

On Tue, Jun 17, 2014 at 11:05:16AM -0400, Nicholas Krause wrote:
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
>  drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> index 1a95d1f..11e915e 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> @@ -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) {

This patch doesn't even apply, what are you doing to create it?

And does it look correct?  To me it sure does not...

thanks,

greg k-h

Re: [PATCHv2] Check if skb_alloc returns Null in function fw_download_code

[Greg KH]

On Tue, Jun 17, 2014 at 12:04:59PM -0400, Nick Krause wrote:
> I created it using  git-format patch and check my condition is
> wrong should be !skb to check for Nulls .

That's not the real problem here.

The real issue is you can not apply your patch to any tree.  Please
remove all patches from your tree that you might have made and rebase
your change on top of a "clean" 3.16-rc1 kernel tree.

thanks,

greg k-h