[PATCHv2] Fixes function fw_download_code to check for Null return from dev_skb_alloc

[PATCHv2] Fixes function fw_download_code to check for Null return from dev_skb_alloc

[Nicholas Krause]

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

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

Re: [PATCHv2] Fixes function fw_download_code to check for Null return from dev_skb_alloc

[Greg KH]

Lots of things wrong here, please step back, and slow down.

Your subject, this really isn't "v2", is it?

On Tue, Jun 17, 2014 at 05:18:01PM -0400, Nicholas Krause wrote:
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>

You aren't saying what you are doing here in the body of the patch, why
not?

> ---
>  drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> index 11e915e..e4c8224 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> @@ -62,12 +62,14 @@ 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;
> +		}

Again, this patch will not apply to the tree, you are making it against
your previous patch, which was rejected.  There is no way I can take
this, right?

Please start over and try again from a "clean" kernel tree.

thanks,

greg k-h