linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] dccp: Fix memleak in __feat_register_sp
@ 2019-04-01  1:35 Yue Haibing
  2019-04-01  8:24 ` Mukesh Ojha
  2019-04-02  1:16 ` David Miller
  0 siblings, 2 replies; 7+ messages in thread
From: Yue Haibing @ 2019-04-01  1:35 UTC (permalink / raw)
  To: davem, gerrit; +Cc: linux-kernel, netdev, dccp, mojha, YueHaibing

From: YueHaibing <yuehaibing@huawei.com>

If dccp_feat_push_change fails, we forget free the mem
which is alloced by kmemdup in dccp_feat_clone_sp_val.

Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values")
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 net/dccp/feat.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/net/dccp/feat.c b/net/dccp/feat.c
index f227f00..db87d9f 100644
--- a/net/dccp/feat.c
+++ b/net/dccp/feat.c
@@ -738,7 +738,12 @@ static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local,
 	if (dccp_feat_clone_sp_val(&fval, sp_val, sp_len))
 		return -ENOMEM;
 
-	return dccp_feat_push_change(fn, feat, is_local, mandatory, &fval);
+	if (dccp_feat_push_change(fn, feat, is_local, mandatory, &fval)) {
+		kfree(fval.sp.vec);
+		return -ENOMEM;
+	}
+
+	return 0;
 }
 
 /**
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH] dccp: Fix memleak in __feat_register_sp
  2019-04-01  1:35 [PATCH] dccp: Fix memleak in __feat_register_sp Yue Haibing
@ 2019-04-01  8:24 ` Mukesh Ojha
  2019-04-01  8:44   ` YueHaibing
  2019-04-02  1:16 ` David Miller
  1 sibling, 1 reply; 7+ messages in thread
From: Mukesh Ojha @ 2019-04-01  8:24 UTC (permalink / raw)
  To: Yue Haibing, davem, gerrit; +Cc: linux-kernel, netdev, dccp


On 4/1/2019 7:05 AM, Yue Haibing wrote:
> From: YueHaibing <yuehaibing@huawei.com>
>
> If dccp_feat_push_change fails, we forget free the mem
> which is alloced by kmemdup in dccp_feat_clone_sp_val.
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values")
> Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---


I don't think it is the first version. Do keep in mind to put detail here .

-Mukesh

>   net/dccp/feat.c | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/net/dccp/feat.c b/net/dccp/feat.c
> index f227f00..db87d9f 100644
> --- a/net/dccp/feat.c
> +++ b/net/dccp/feat.c
> @@ -738,7 +738,12 @@ static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local,
>   	if (dccp_feat_clone_sp_val(&fval, sp_val, sp_len))
>   		return -ENOMEM;
>   
> -	return dccp_feat_push_change(fn, feat, is_local, mandatory, &fval);
> +	if (dccp_feat_push_change(fn, feat, is_local, mandatory, &fval)) {
> +		kfree(fval.sp.vec);
> +		return -ENOMEM;
> +	}
> +
> +	return 0;
>   }
>   
>   /**

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] dccp: Fix memleak in __feat_register_sp
  2019-04-01  8:24 ` Mukesh Ojha
@ 2019-04-01  8:44   ` YueHaibing
  0 siblings, 0 replies; 7+ messages in thread
From: YueHaibing @ 2019-04-01  8:44 UTC (permalink / raw)
  To: Mukesh Ojha, davem, gerrit; +Cc: linux-kernel, netdev, dccp

On 2019/4/1 16:24, Mukesh Ojha wrote:
> 
> On 4/1/2019 7:05 AM, Yue Haibing wrote:
>> From: YueHaibing <yuehaibing@huawei.com>
>>
>> If dccp_feat_push_change fails, we forget free the mem
>> which is alloced by kmemdup in dccp_feat_clone_sp_val.
>>
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values")
>> Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> ---
> 
> 
> I don't think it is the first version. Do keep in mind to put detail here .

Yes, this is the v3 resend.

> 
> -Mukesh
> 
>>   net/dccp/feat.c | 7 ++++++-
>>   1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/net/dccp/feat.c b/net/dccp/feat.c
>> index f227f00..db87d9f 100644
>> --- a/net/dccp/feat.c
>> +++ b/net/dccp/feat.c
>> @@ -738,7 +738,12 @@ static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local,
>>       if (dccp_feat_clone_sp_val(&fval, sp_val, sp_len))
>>           return -ENOMEM;
>>   -    return dccp_feat_push_change(fn, feat, is_local, mandatory, &fval);
>> +    if (dccp_feat_push_change(fn, feat, is_local, mandatory, &fval)) {
>> +        kfree(fval.sp.vec);
>> +        return -ENOMEM;
>> +    }
>> +
>> +    return 0;
>>   }
>>     /**
> 
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] dccp: Fix memleak in __feat_register_sp
  2019-04-01  1:35 [PATCH] dccp: Fix memleak in __feat_register_sp Yue Haibing
  2019-04-01  8:24 ` Mukesh Ojha
@ 2019-04-02  1:16 ` David Miller
  1 sibling, 0 replies; 7+ messages in thread
From: David Miller @ 2019-04-02  1:16 UTC (permalink / raw)
  To: yuehaibing; +Cc: gerrit, linux-kernel, netdev, dccp, mojha

From: Yue Haibing <yuehaibing@huawei.com>
Date: Mon, 1 Apr 2019 09:35:54 +0800

> From: YueHaibing <yuehaibing@huawei.com>
> 
> If dccp_feat_push_change fails, we forget free the mem
> which is alloced by kmemdup in dccp_feat_clone_sp_val.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values")
> Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Applied.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] dccp: Fix memleak in __feat_register_sp
  2019-03-22 11:52 ` Mukesh Ojha
@ 2019-03-22 13:39   ` YueHaibing
  0 siblings, 0 replies; 7+ messages in thread
From: YueHaibing @ 2019-03-22 13:39 UTC (permalink / raw)
  To: Mukesh Ojha, davem, gerrit; +Cc: linux-kernel, netdev, dccp

On 2019/3/22 19:52, Mukesh Ojha wrote:
> 
> On 3/21/2019 7:40 PM, Yue Haibing wrote:
>> From: YueHaibing <yuehaibing@huawei.com>
>>
>> If dccp_feat_push_change fails, we forget free the mem
>> which is alloced by kmemdup in dccp_feat_clone_sp_val.
>>
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values")
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> ---
>>   net/dccp/feat.c | 7 ++++++-
>>   1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/net/dccp/feat.c b/net/dccp/feat.c
>> index f227f00..083e012 100644
>> --- a/net/dccp/feat.c
>> +++ b/net/dccp/feat.c
>> @@ -738,7 +738,12 @@ static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local,
>>       if (dccp_feat_clone_sp_val(&fval, sp_val, sp_len))
>>           return -ENOMEM;
>>   -    return dccp_feat_push_change(fn, feat, is_local, mandatory, &fval);
>> +    if (dccp_feat_push_change(fn, feat, is_local, mandatory, &fval)) {
>> +        kfree(val->sp.vec);
> 
> Please atleast check the compilation first, don't  just rush into sending patch.
> 
> s/val/fval

A copy-paste typo, will fix it. Thanks!

> 
> 
> Thanks,
> Mukesh
> 
>> +        return -ENOMEM;
>> +    }
>> +
>> +    return 0;
>>   }
>>     /**
> 
> .
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] dccp: Fix memleak in __feat_register_sp
  2019-03-21 14:10 Yue Haibing
@ 2019-03-22 11:52 ` Mukesh Ojha
  2019-03-22 13:39   ` YueHaibing
  0 siblings, 1 reply; 7+ messages in thread
From: Mukesh Ojha @ 2019-03-22 11:52 UTC (permalink / raw)
  To: Yue Haibing, davem, gerrit; +Cc: linux-kernel, netdev, dccp


On 3/21/2019 7:40 PM, Yue Haibing wrote:
> From: YueHaibing <yuehaibing@huawei.com>
>
> If dccp_feat_push_change fails, we forget free the mem
> which is alloced by kmemdup in dccp_feat_clone_sp_val.
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>   net/dccp/feat.c | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/net/dccp/feat.c b/net/dccp/feat.c
> index f227f00..083e012 100644
> --- a/net/dccp/feat.c
> +++ b/net/dccp/feat.c
> @@ -738,7 +738,12 @@ static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local,
>   	if (dccp_feat_clone_sp_val(&fval, sp_val, sp_len))
>   		return -ENOMEM;
>   
> -	return dccp_feat_push_change(fn, feat, is_local, mandatory, &fval);
> +	if (dccp_feat_push_change(fn, feat, is_local, mandatory, &fval)) {
> +		kfree(val->sp.vec);

Please atleast check the compilation first, don't  just rush into 
sending patch.

s/val/fval


Thanks,
Mukesh

> +		return -ENOMEM;
> +	}
> +
> +	return 0;
>   }
>   
>   /**

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] dccp: Fix memleak in __feat_register_sp
@ 2019-03-21 14:10 Yue Haibing
  2019-03-22 11:52 ` Mukesh Ojha
  0 siblings, 1 reply; 7+ messages in thread
From: Yue Haibing @ 2019-03-21 14:10 UTC (permalink / raw)
  To: davem, gerrit; +Cc: linux-kernel, netdev, dccp, YueHaibing

From: YueHaibing <yuehaibing@huawei.com>

If dccp_feat_push_change fails, we forget free the mem
which is alloced by kmemdup in dccp_feat_clone_sp_val.

Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 net/dccp/feat.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/net/dccp/feat.c b/net/dccp/feat.c
index f227f00..083e012 100644
--- a/net/dccp/feat.c
+++ b/net/dccp/feat.c
@@ -738,7 +738,12 @@ static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local,
 	if (dccp_feat_clone_sp_val(&fval, sp_val, sp_len))
 		return -ENOMEM;
 
-	return dccp_feat_push_change(fn, feat, is_local, mandatory, &fval);
+	if (dccp_feat_push_change(fn, feat, is_local, mandatory, &fval)) {
+		kfree(val->sp.vec);
+		return -ENOMEM;
+	}
+
+	return 0;
 }
 
 /**
-- 
2.7.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-04-02  1:16 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-01  1:35 [PATCH] dccp: Fix memleak in __feat_register_sp Yue Haibing
2019-04-01  8:24 ` Mukesh Ojha
2019-04-01  8:44   ` YueHaibing
2019-04-02  1:16 ` David Miller
  -- strict thread matches above, loose matches on Subject: below --
2019-03-21 14:10 Yue Haibing
2019-03-22 11:52 ` Mukesh Ojha
2019-03-22 13:39   ` YueHaibing

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).