* [PATCH] staging: rtl8712: rtl871x_ioctl_linux.c: Cleaning up memory leak
@ 2014-06-01 11:30 Rickard Strandqvist
2014-06-01 22:28 ` Christian Engelmayer
2014-06-02 8:41 ` Dan Carpenter
0 siblings, 2 replies; 4+ messages in thread
From: Rickard Strandqvist @ 2014-06-01 11:30 UTC (permalink / raw)
To: Larry Finger, Florian Schilhabel
Cc: Rickard Strandqvist, Greg Kroah-Hartman, Paul Gortmaker,
Thomas Cort, Andy Shevchenko, devel, linux-kernel
There is a risk for memory leak in when something unexpected happens
and the function returns.
This was largely found by using a static code analysis program called cppcheck.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 23d539d..27e0243 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -1822,6 +1822,7 @@ static int r871x_wx_set_enc_ext(struct net_device *dev,
alg_name = "CCMP";
break;
default:
+ kfree(param);
return -EINVAL;
}
strncpy((char *)param->u.crypt.alg, alg_name, IEEE_CRYPT_ALG_NAME_LEN);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: rtl8712: rtl871x_ioctl_linux.c: Cleaning up memory leak
2014-06-01 11:30 [PATCH] staging: rtl8712: rtl871x_ioctl_linux.c: Cleaning up memory leak Rickard Strandqvist
@ 2014-06-01 22:28 ` Christian Engelmayer
2014-06-02 8:41 ` Dan Carpenter
1 sibling, 0 replies; 4+ messages in thread
From: Christian Engelmayer @ 2014-06-01 22:28 UTC (permalink / raw)
To: Rickard Strandqvist
Cc: Larry Finger, Florian Schilhabel, devel, Greg Kroah-Hartman,
linux-kernel, Paul Gortmaker, Thomas Cort, Andy Shevchenko
On Sun, 1 Jun 2014 13:30:43 +0200, Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> wrote:
> There is a risk for memory leak in when something unexpected happens
> and the function returns.
>
> This was largely found by using a static code analysis program called cppcheck.
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
> ---
> drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> index 23d539d..27e0243 100644
> --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> @@ -1822,6 +1822,7 @@ static int r871x_wx_set_enc_ext(struct net_device *dev,
> alg_name = "CCMP";
> break;
> default:
> + kfree(param);
> return -EINVAL;
> }
> strncpy((char *)param->u.crypt.alg, alg_name, IEEE_CRYPT_ALG_NAME_LEN);
Hi Rickard,
This one doesn't apply either. Commit 55d4f6cc (staging: rtl8712: fix potential
leak in r871x_wx_set_enc_ext()) moved the input verification to the beginning
of the function so that the direct return no longer hurt. This change was also
already in flight at the time of Your first version of the patch in May.
Please check that Your patches are based on linux-next.
Best Regards,
Christian
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: rtl8712: rtl871x_ioctl_linux.c: Cleaning up memory leak
2014-06-01 11:30 [PATCH] staging: rtl8712: rtl871x_ioctl_linux.c: Cleaning up memory leak Rickard Strandqvist
2014-06-01 22:28 ` Christian Engelmayer
@ 2014-06-02 8:41 ` Dan Carpenter
2014-06-02 22:09 ` Rickard Strandqvist
1 sibling, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2014-06-02 8:41 UTC (permalink / raw)
To: Rickard Strandqvist
Cc: Larry Finger, Florian Schilhabel, devel, Greg Kroah-Hartman,
linux-kernel, Paul Gortmaker, Thomas Cort, Andy Shevchenko
On Sun, Jun 01, 2014 at 01:30:43PM +0200, Rickard Strandqvist wrote:
> There is a risk for memory leak in when something unexpected happens
> and the function returns.
>
> This was largely found by using a static code analysis program called cppcheck.
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
> ---
> drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> index 23d539d..27e0243 100644
> --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> @@ -1822,6 +1822,7 @@ static int r871x_wx_set_enc_ext(struct net_device *dev,
> alg_name = "CCMP";
> break;
> default:
> + kfree(param);
Wat? Param isn't even allocated at this point. It gets allocated a
couple lines later.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: rtl8712: rtl871x_ioctl_linux.c: Cleaning up memory leak
2014-06-02 8:41 ` Dan Carpenter
@ 2014-06-02 22:09 ` Rickard Strandqvist
0 siblings, 0 replies; 4+ messages in thread
From: Rickard Strandqvist @ 2014-06-02 22:09 UTC (permalink / raw)
To: Dan Carpenter
Cc: Larry Finger, Florian Schilhabel, devel, Greg Kroah-Hartman,
linux-kernel@vger.kernel.org, Paul Gortmaker, Thomas Cort,
Andy Shevchenko
Hi
Okay, this code has been changed in linux-next, before the allocation
before the switch statement.
Yes, I repeat it to myself.. I'll check everything against linux-next
in the future!
Best regards
Rickard Strandqvist
2014-06-02 10:41 GMT+02:00 Dan Carpenter <dan.carpenter@oracle.com>:
> On Sun, Jun 01, 2014 at 01:30:43PM +0200, Rickard Strandqvist wrote:
>> There is a risk for memory leak in when something unexpected happens
>> and the function returns.
>>
>> This was largely found by using a static code analysis program called cppcheck.
>>
>> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
>> ---
>> drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
>> index 23d539d..27e0243 100644
>> --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
>> +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
>> @@ -1822,6 +1822,7 @@ static int r871x_wx_set_enc_ext(struct net_device *dev,
>> alg_name = "CCMP";
>> break;
>> default:
>> + kfree(param);
>
> Wat? Param isn't even allocated at this point. It gets allocated a
> couple lines later.
>
> regards,
> dan carpenter
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-06-02 22:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-01 11:30 [PATCH] staging: rtl8712: rtl871x_ioctl_linux.c: Cleaning up memory leak Rickard Strandqvist
2014-06-01 22:28 ` Christian Engelmayer
2014-06-02 8:41 ` Dan Carpenter
2014-06-02 22:09 ` Rickard Strandqvist
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox