* [PATCH] staging: Check for Null return of fw_download_code
@ 2014-08-13 19:54 Nicholas Krause
2014-08-13 19:55 ` Nick Krause
0 siblings, 1 reply; 6+ messages in thread
From: Nicholas Krause @ 2014-08-13 19:54 UTC (permalink / raw)
To: kernelnewbies
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[TXCMD_QUEUE]);
+ 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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] staging: Check for Null return of fw_download_code
2014-08-13 19:54 [PATCH] staging: Check for Null return of fw_download_code Nicholas Krause
@ 2014-08-13 19:55 ` Nick Krause
0 siblings, 0 replies; 6+ messages in thread
From: Nick Krause @ 2014-08-13 19:55 UTC (permalink / raw)
To: kernelnewbies
On Wed, Aug 13, 2014 at 3:54 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[TXCMD_QUEUE]);
> + 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
>
If there are any other errors with this patch, please let me known. I
checked again and there are no warnings or build errors.
Sorry to Valdis about the stupid questions.
Nick
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] staging: Check for Null return of fw_download_code
@ 2014-08-13 19:59 Nicholas Krause
2014-08-13 20:01 ` Nick Krause
0 siblings, 1 reply; 6+ messages in thread
From: Nicholas Krause @ 2014-08-13 19:59 UTC (permalink / raw)
To: kernelnewbies
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[TXCMD_QUEUE]);
+ 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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] staging: Check for Null return of fw_download_code
2014-08-13 19:59 Nicholas Krause
@ 2014-08-13 20:01 ` Nick Krause
0 siblings, 0 replies; 6+ messages in thread
From: Nick Krause @ 2014-08-13 20:01 UTC (permalink / raw)
To: kernelnewbies
On Wed, Aug 13, 2014 at 3:59 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[TXCMD_QUEUE]);
> + 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
>
Forget to run checkpatch , only care about second patch. The first one
I didn't run through checkpatch and got a error.
Sorry Again Nick
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] staging: Check for Null return of fw_download_code
@ 2014-08-13 19:00 Nicholas Krause
2014-08-13 19:01 ` Nick Krause
0 siblings, 1 reply; 6+ messages in thread
From: Nicholas Krause @ 2014-08-13 19:00 UTC (permalink / raw)
To: kernelnewbies
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] staging: Check for Null return of fw_download_code
2014-08-13 19:00 Nicholas Krause
@ 2014-08-13 19:01 ` Nick Krause
0 siblings, 0 replies; 6+ messages in thread
From: Nick Krause @ 2014-08-13 19:01 UTC (permalink / raw)
To: kernelnewbies
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-08-13 20:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-13 19:54 [PATCH] staging: Check for Null return of fw_download_code Nicholas Krause
2014-08-13 19:55 ` Nick Krause
-- strict thread matches above, loose matches on Subject: below --
2014-08-13 19:59 Nicholas Krause
2014-08-13 20:01 ` Nick Krause
2014-08-13 19:00 Nicholas Krause
2014-08-13 19:01 ` Nick Krause
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).