* [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc
@ 2014-06-19 21:18 Nicholas Krause
2014-06-20 2:12 ` Nick Krause
0 siblings, 1 reply; 10+ messages in thread
From: Nicholas Krause @ 2014-06-19 21:18 UTC (permalink / raw)
To: gregkh; +Cc: lisa, valentina.manea.m, ben, devel, linux-kernel
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.
Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
index 1a95d1f..affa89a 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
@@ -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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc
2014-06-19 21:18 [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc Nicholas Krause
@ 2014-06-20 2:12 ` Nick Krause
2014-06-20 3:46 ` Nick Krause
0 siblings, 1 reply; 10+ messages in thread
From: Nick Krause @ 2014-06-20 2:12 UTC (permalink / raw)
To: Greg KH; +Cc: lisa, Valentina Manea, ben, devel, linux-kernel
If anyone able to check this patch it would be great.
Thanks Nick
On Thu, Jun 19, 2014 at 5:18 PM, Nicholas Krause <xerofoify@gmail.com> wrote:
> 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.
>
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
> drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> index 1a95d1f..affa89a 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> @@ -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
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc
2014-06-20 2:12 ` Nick Krause
@ 2014-06-20 3:46 ` Nick Krause
0 siblings, 0 replies; 10+ messages in thread
From: Nick Krause @ 2014-06-20 3:46 UTC (permalink / raw)
To: Greg KH; +Cc: lisa, Valentina Manea, ben, devel, linux-kernel
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
On Thu, Jun 19, 2014 at 10:12 PM, Nick Krause <xerofoify@gmail.com> wrote:
> If anyone able to check this patch it would be great.
> Thanks Nick
>
> On Thu, Jun 19, 2014 at 5:18 PM, Nicholas Krause <xerofoify@gmail.com> wrote:
>> 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.
>>
>> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
>> ---
>> drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 ++++---
>> 1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
>> index 1a95d1f..affa89a 100644
>> --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
>> +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
>> @@ -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
>>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc
2014-06-20 16:49 Nicholas Krause
@ 2014-06-20 19:53 ` Dan Carpenter
0 siblings, 0 replies; 10+ messages in thread
From: Dan Carpenter @ 2014-06-20 19:53 UTC (permalink / raw)
To: Nicholas Krause; +Cc: gregkh, devel, lisa, ben, valentina.manea.m, linux-kernel
On Fri, Jun 20, 2014 at 12:49:55PM -0400, Nicholas Krause wrote:
> 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.
>
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
What is this? This patch is really bad and also doesn't apply. Greg
already told you not to send any more patches until next week so it's
just going to be ignored...
Please slow down and don't send this again until it is correct.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc
@ 2014-06-20 16:49 Nicholas Krause
2014-06-20 19:53 ` Dan Carpenter
0 siblings, 1 reply; 10+ messages in thread
From: Nicholas Krause @ 2014-06-20 16:49 UTC (permalink / raw)
To: gregkh; +Cc: ben, lisa, valentina.manea.m, devel, linux-kernel
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.
Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
index 1a95d1f..affa89a 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
@@ -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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc
2014-06-19 20:53 ` Joe Perches
@ 2014-06-19 21:12 ` Nick Krause
0 siblings, 0 replies; 10+ messages in thread
From: Nick Krause @ 2014-06-19 21:12 UTC (permalink / raw)
To: Joe Perches; +Cc: Greg KH, lisa, Valentina Manea, ben, devel, linux-kernel
Thanks Joe,
I need to read my patches more carefully.
Nick :)
On Thu, Jun 19, 2014 at 4:53 PM, Joe Perches <joe@perches.com> wrote:
> On Thu, 2014-06-19 at 16:20 -0400, Nick Krause wrote:
>> Hey Guys,
>> So Sorry about wasting your time with bad patchs.
>> I feel bad about that. I hope this patch is O.K.
>> now. :(
>
> Oh, one other thing...
>
>> > diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> []
>> > @@ -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;
> []
>> > @@ -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 false;
>
> This should be:
>
> return true;
>
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc
2014-06-19 20:20 ` Nick Krause
2014-06-19 20:51 ` Joe Perches
@ 2014-06-19 20:53 ` Joe Perches
2014-06-19 21:12 ` Nick Krause
1 sibling, 1 reply; 10+ messages in thread
From: Joe Perches @ 2014-06-19 20:53 UTC (permalink / raw)
To: Nick Krause; +Cc: Greg KH, lisa, Valentina Manea, ben, devel, linux-kernel
On Thu, 2014-06-19 at 16:20 -0400, Nick Krause wrote:
> Hey Guys,
> So Sorry about wasting your time with bad patchs.
> I feel bad about that. I hope this patch is O.K.
> now. :(
Oh, one other thing...
> > diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
[]
> > @@ -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;
[]
> > @@ -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 false;
This should be:
return true;
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc
2014-06-19 20:20 ` Nick Krause
@ 2014-06-19 20:51 ` Joe Perches
2014-06-19 20:53 ` Joe Perches
1 sibling, 0 replies; 10+ messages in thread
From: Joe Perches @ 2014-06-19 20:51 UTC (permalink / raw)
To: Nick Krause; +Cc: Greg KH, lisa, Valentina Manea, ben, devel, linux-kernel
On Thu, 2014-06-19 at 16:20 -0400, Nick Krause wrote:
> Hey Guys,
> So Sorry about wasting your time with bad patchs.
> I feel bad about that. I hope this patch is O.K.
> now. :(
It's not.
> > diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
[]
> > @@ -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;
> > skb = dev_alloc_skb(frag_length + 4);
You're still wasting time and not thoroughly
reading your own patches.
You've duplicated the dev_alloc_skb line.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc
2014-06-19 20:18 Nicholas Krause
@ 2014-06-19 20:20 ` Nick Krause
2014-06-19 20:51 ` Joe Perches
2014-06-19 20:53 ` Joe Perches
0 siblings, 2 replies; 10+ messages in thread
From: Nick Krause @ 2014-06-19 20:20 UTC (permalink / raw)
To: Greg KH; +Cc: lisa, Valentina Manea, ben, devel, linux-kernel
Hey Guys,
So Sorry about wasting your time with bad patchs.
I feel bad about that. I hope this patch is O.K.
now. :(
Nicholas Krause
On Thu, Jun 19, 2014 at 4:18 PM, Nicholas Krause <xerofoify@gmail.com> wrote:
> 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.
>
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
> drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> index 1a95d1f..affa89a 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
> @@ -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;
> skb = dev_alloc_skb(frag_length + 4);
> 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 false;
> }
>
> static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc
@ 2014-06-19 20:18 Nicholas Krause
2014-06-19 20:20 ` Nick Krause
0 siblings, 1 reply; 10+ messages in thread
From: Nicholas Krause @ 2014-06-19 20:18 UTC (permalink / raw)
To: gregkh; +Cc: lisa, valentina.manea.m, ben, devel, linux-kernel
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.
Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
index 1a95d1f..affa89a 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
@@ -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;
skb = dev_alloc_skb(frag_length + 4);
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 false;
}
static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-06-20 19:53 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-19 21:18 [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc Nicholas Krause
2014-06-20 2:12 ` Nick Krause
2014-06-20 3:46 ` Nick Krause
-- strict thread matches above, loose matches on Subject: below --
2014-06-20 16:49 Nicholas Krause
2014-06-20 19:53 ` Dan Carpenter
2014-06-19 20:18 Nicholas Krause
2014-06-19 20:20 ` Nick Krause
2014-06-19 20:51 ` Joe Perches
2014-06-19 20:53 ` Joe Perches
2014-06-19 21:12 ` 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).