diff mbox series

net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()

Message ID 20230208071623.13013-1-hbh25y@gmail.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series net: openvswitch: fix possible memory leak in ovs_meter_cmd_set() | expand

Checks

Context Check Description
netdev/tree_selection success Guessed tree name to be net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers success CCed 8 of 8 maintainers
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 11 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Hangyu Hua Feb. 8, 2023, 7:16 a.m. UTC
old_meter needs to be free after it is detached regardless of whether
the new meter is successfully attached.

Fixes: c7c4c44c9a95 ("net: openvswitch: expand the meters supported number")
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
---
 net/openvswitch/meter.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Eelco Chaudron Feb. 9, 2023, 8:26 a.m. UTC | #1
On 8 Feb 2023, at 8:16, Hangyu Hua wrote:

> old_meter needs to be free after it is detached regardless of whether
> the new meter is successfully attached.
>
> Fixes: c7c4c44c9a95 ("net: openvswitch: expand the meters supported number")
> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
> ---
>  net/openvswitch/meter.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
> index 6e38f68f88c2..e84082e209e9 100644
> --- a/net/openvswitch/meter.c
> +++ b/net/openvswitch/meter.c
> @@ -448,8 +448,10 @@ static int ovs_meter_cmd_set(struct sk_buff *skb, struct genl_info *info)
>  		goto exit_unlock;
>
>  	err = attach_meter(meter_tbl, meter);
> -	if (err)
> +	if (err) {
> +		ovs_meter_free(old_meter);
>  		goto exit_unlock;

It would be nicer to add another goto label like exit_free_old_meter.

+	if (err)
+     	goto exit_free_old_meter:

exit_free_old_meter:
    ovs_meter_free(old_meter);
exit_unlock:
	ovs_unlock();
	nlmsg_free(reply);
exit_free_meter:


Or maybe it would be even nicer to free the old_meter outside of the global lock?

> +	}
>
>  	ovs_unlock();
>
> -- 
> 2.34.1
Hangyu Hua Feb. 9, 2023, 8:58 a.m. UTC | #2
On 9/2/2023 16:26, Eelco Chaudron wrote:
> 
> 
> On 8 Feb 2023, at 8:16, Hangyu Hua wrote:
> 
>> old_meter needs to be free after it is detached regardless of whether
>> the new meter is successfully attached.
>>
>> Fixes: c7c4c44c9a95 ("net: openvswitch: expand the meters supported number")
>> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
>> ---
>>   net/openvswitch/meter.c | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
>> index 6e38f68f88c2..e84082e209e9 100644
>> --- a/net/openvswitch/meter.c
>> +++ b/net/openvswitch/meter.c
>> @@ -448,8 +448,10 @@ static int ovs_meter_cmd_set(struct sk_buff *skb, struct genl_info *info)
>>   		goto exit_unlock;
>>
>>   	err = attach_meter(meter_tbl, meter);
>> -	if (err)
>> +	if (err) {
>> +		ovs_meter_free(old_meter);
>>   		goto exit_unlock;
> 
> It would be nicer to add another goto label like exit_free_old_meter.
> 
> +	if (err)
> +     	goto exit_free_old_meter:
> 
> exit_free_old_meter:
>      ovs_meter_free(old_meter);
> exit_unlock:
> 	ovs_unlock();
> 	nlmsg_free(reply);
> exit_free_meter:
> 
> 
> Or maybe it would be even nicer to free the old_meter outside of the global lock?
> 
>> +	}
>>
>>   	ovs_unlock();

I get it. I will send a v2.

Thanks,
Hangyu
>>
>> -- 
>> 2.34.1
>
diff mbox series

Patch

diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index 6e38f68f88c2..e84082e209e9 100644
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -448,8 +448,10 @@  static int ovs_meter_cmd_set(struct sk_buff *skb, struct genl_info *info)
 		goto exit_unlock;
 
 	err = attach_meter(meter_tbl, meter);
-	if (err)
+	if (err) {
+		ovs_meter_free(old_meter);
 		goto exit_unlock;
+	}
 
 	ovs_unlock();