From:   Eelco Chaudron <echaudro@redhat.com>
To:     Hangyu Hua <hbh25y@gmail.com>
Cc:     pshelar@ovn.org, davem@davemloft.net, edumazet@google.com,
        kuba@kernel.org, pabeni@redhat.com, xiangxia.m.yue@gmail.com,
        simon.horman@corigine.com, netdev@vger.kernel.org,
        dev@openvswitch.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] net: openvswitch: fix possible memory leak in
 ovs_meter_cmd_set()
Date:   Fri, 10 Feb 2023 08:35:50 +0100
Message-ID: <6582F9D7-D74B-4A4A-A498-1B3002B9840E@redhat.com>
In-Reply-To: <20230210020551.6682-1-hbh25y@gmail.com>
References: <20230210020551.6682-1-hbh25y@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Precedence: bulk


On 10 Feb 2023, at 3:05, 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 num=
ber")
> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>

Thanks for doing a v3. The change looks good to me!

Acked-by: Eelco Chaudron <echaudro@redhat.com>

> ---
>
> v2: use goto label and free old_meter outside of ovs lock.
>
> v3: add the label and keep the lock in place.
>
>  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..f2698d2316df 100644
> --- a/net/openvswitch/meter.c
> +++ b/net/openvswitch/meter.c
> @@ -449,7 +449,7 @@ static int ovs_meter_cmd_set(struct sk_buff *skb, s=
truct genl_info *info)
>
>  	err =3D attach_meter(meter_tbl, meter);
>  	if (err)
> -		goto exit_unlock;
> +		goto exit_free_old_meter;
>  	ovs_unlock();
>
> @@ -472,6 +472,8 @@ static int ovs_meter_cmd_set(struct sk_buff *skb, s=
truct genl_info *info)
>  	genlmsg_end(reply, ovs_reply_header);
>  	return genlmsg_reply(reply, info);
>
> +exit_free_old_meter:
> +	ovs_meter_free(old_meter);
>  exit_unlock:
>  	ovs_unlock();
>  	nlmsg_free(reply);
> -- =

> 2.34.1