* [PATCH] fs/nfs/idmap.c: fix a Memory leak for variable desc
@ 2014-04-26 19:55 Toralf Förster
2014-04-27 0:10 ` Trond Myklebust
0 siblings, 1 reply; 3+ messages in thread
From: Toralf Förster @ 2014-04-26 19:55 UTC (permalink / raw)
To: linux-nfs; +Cc: Toralf Förster
Signed-off-by: Toralf Förster <toralf.foerster@gmx.de>
---
fs/nfs/idmap.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index 567983d..8eb4954 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -272,8 +272,10 @@ static struct key *nfs_idmap_request_key(const char *name, size_t namelen,
ssize_t ret;
ret = nfs_idmap_get_desc(name, namelen, type, strlen(type), &desc);
- if (ret <= 0)
+ if (ret <= 0) {
+ kfree(desc);
return ERR_PTR(ret);
+ }
rkey = request_key(&key_type_id_resolver, desc, "");
if (IS_ERR(rkey)) {
--
1.9.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] fs/nfs/idmap.c: fix a Memory leak for variable desc
2014-04-26 19:55 [PATCH] fs/nfs/idmap.c: fix a Memory leak for variable desc Toralf Förster
@ 2014-04-27 0:10 ` Trond Myklebust
2014-04-27 8:34 ` Toralf Förster
0 siblings, 1 reply; 3+ messages in thread
From: Trond Myklebust @ 2014-04-27 0:10 UTC (permalink / raw)
To: Toralf Förster; +Cc: linux-nfs
On Sat, Apr 26, 2014 at 3:55 PM, Toralf Förster <toralf.foerster@gmx.de> wrote:
> Signed-off-by: Toralf Förster <toralf.foerster@gmx.de>
> ---
> fs/nfs/idmap.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
> index 567983d..8eb4954 100644
> --- a/fs/nfs/idmap.c
> +++ b/fs/nfs/idmap.c
> @@ -272,8 +272,10 @@ static struct key *nfs_idmap_request_key(const char *name, size_t namelen,
> ssize_t ret;
>
> ret = nfs_idmap_get_desc(name, namelen, type, strlen(type), &desc);
> - if (ret <= 0)
> + if (ret <= 0) {
> + kfree(desc);
> return ERR_PTR(ret);
> + }
>
> rkey = request_key(&key_type_id_resolver, desc, "");
> if (IS_ERR(rkey)) {
Hi Toralf,
As far as I can tell, the only error that nfs_idmap_get_desc() can
return is ret==-ENOMEM, in which case desc==NULL.
It cannot ever return ret==0, either, since the return value,
'desclen', has a lower bound of '2'. What am I missing?
Cheers
Trond
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fs/nfs/idmap.c: fix a Memory leak for variable desc
2014-04-27 0:10 ` Trond Myklebust
@ 2014-04-27 8:34 ` Toralf Förster
0 siblings, 0 replies; 3+ messages in thread
From: Toralf Förster @ 2014-04-27 8:34 UTC (permalink / raw)
To: Trond Myklebust; +Cc: linux-nfs
On 04/27/2014 02:10 AM, Trond Myklebust wrote:
> On Sat, Apr 26, 2014 at 3:55 PM, Toralf Förster <toralf.foerster@gmx.de> wrote:
>> Signed-off-by: Toralf Förster <toralf.foerster@gmx.de>
>> ---
>> fs/nfs/idmap.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
>> index 567983d..8eb4954 100644
>> --- a/fs/nfs/idmap.c
>> +++ b/fs/nfs/idmap.c
>> @@ -272,8 +272,10 @@ static struct key *nfs_idmap_request_key(const char *name, size_t namelen,
>> ssize_t ret;
>>
>> ret = nfs_idmap_get_desc(name, namelen, type, strlen(type), &desc);
>> - if (ret <= 0)
>> + if (ret <= 0) {
>> + kfree(desc);
>> return ERR_PTR(ret);
>> + }
>>
>> rkey = request_key(&key_type_id_resolver, desc, "");
>> if (IS_ERR(rkey)) {
>
> Hi Toralf,
>
> As far as I can tell, the only error that nfs_idmap_get_desc() can
> return is ret==-ENOMEM, in which case desc==NULL.
> It cannot ever return ret==0, either, since the return value,
> 'desclen', has a lower bound of '2'. <-----------------
Ick, that I was missing - sry for the noise.
> Cheers
> Trond
>
--
Toralf
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-27 8:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-26 19:55 [PATCH] fs/nfs/idmap.c: fix a Memory leak for variable desc Toralf Förster
2014-04-27 0:10 ` Trond Myklebust
2014-04-27 8:34 ` Toralf Förster
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).