[PATCH] staging: Check for Null return of fw_download_code
This patch fixes the bug , https://bugzilla.kernel.org/show_bug.cgi?id=60461 on the kernel bugzilla. Further more I am checking if we are allocating a NULL skb and if so make rt_status to false and free the quene we are using for allocated skbs in the while/do loop with skb_quene_purge. Signed-off-by: Nicholas Krause <xerofoify@gmail.com> --- drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c index 1a95d1f..0f18c6d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c @@ -61,6 +61,11 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, } skb = dev_alloc_skb(frag_length + 4); + if (skb == NULL ) { + rt_status = false; + skb_queue_purge(&priv->rtllib->skb_waitQ[tcb_desc->queue_index]); + break; + } 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; -- 1.9.1
On Wed, Aug 13, 2014 at 3:00 PM, Nicholas Krause <xerofoify@gmail.com> wrote:
This patch fixes the bug , https://bugzilla.kernel.org/show_bug.cgi?id=60461 on the kernel bugzilla. Further more I am checking if we are allocating a NULL skb and if so make rt_status to false and free the quene we are using for allocated skbs in the while/do loop with skb_quene_purge.
Signed-off-by: Nicholas Krause <xerofoify@gmail.com> --- drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c index 1a95d1f..0f18c6d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c @@ -61,6 +61,11 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, }
skb = dev_alloc_skb(frag_length + 4); + if (skb == NULL ) { + rt_status = false; + skb_queue_purge(&priv->rtllib->skb_waitQ[tcb_desc->queue_index]); + break; + } 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; -- 1.9.1
This is the fixed patch, I do get an error about uninitialized variables but assume that it's common based on other errors I am getting. If someone wants to send this out, please do so as this is has been built and applied tested. Nick
participants (2)
-
Nicholas Krause -
Nick Krause