2019-04-01 01:40:17

by Yue Haibing

Subject: [PATCH] dccp: Fix memleak in __feat_register_sp

From: YueHaibing <[email protected]>

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 <[email protected]>
Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values")
Reviewed-by: Mukesh Ojha <[email protected]>
Signed-off-by: YueHaibing <[email protected]>
---
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

2019-04-01 08:25:26

by Mukesh Ojha

Subject: Re: [PATCH] dccp: Fix memleak in __feat_register_sp

On 4/1/2019 7:05 AM, Yue Haibing wrote:
> From: YueHaibing <[email protected]>
>
> 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 <[email protected]>
> Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values")
> Reviewed-by: Mukesh Ojha <[email protected]>
> Signed-off-by: YueHaibing <[email protected]>
> ---


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;
> }
>
> /**

2019-04-01 08:46:57

by Yue Haibing

Subject: Re: [PATCH] dccp: Fix memleak in __feat_register_sp

On 2019/4/1 16:24, Mukesh Ojha wrote:
>
> On 4/1/2019 7:05 AM, Yue Haibing wrote:
>> From: YueHaibing <[email protected]>
>>
>> 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 <[email protected]>
>> Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values")
>> Reviewed-by: Mukesh Ojha <[email protected]>
>> Signed-off-by: YueHaibing <[email protected]>
>> ---
>
>
> 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;
>> }
>> /**
>
>

2019-04-02 01:17:34

by David Miller

Subject: Re: [PATCH] dccp: Fix memleak in __feat_register_sp

From: Yue Haibing <[email protected]>
Date: Mon, 1 Apr 2019 09:35:54 +0800

> From: YueHaibing <[email protected]>
>
> 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 <[email protected]>
> Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values")
> Reviewed-by: Mukesh Ojha <[email protected]>
> Signed-off-by: YueHaibing <[email protected]>

Applied.