netdev - Re: [PATCH] net: openvswitch: fix possible memory leak in ovs_meter_cmd

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <155E8FC1-746B-4BA4-BA80-60868B076F00@redhat.com>
Date:   Thu, 09 Feb 2023 09:26:59 +0100
From:   Eelco Chaudron <echaudro@...hat.com>
To:     Hangyu Hua <hbh25y@...il.com>
Cc:     pshelar@....org, davem@...emloft.net, edumazet@...gle.com,
        kuba@...nel.org, pabeni@...hat.com, xiangxia.m.yue@...il.com,
        netdev@...r.kernel.org, dev@...nvswitch.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH] net: openvswitch: fix possible memory leak in
 ovs_meter_cmd_set()



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@...il.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