* [PATCH v3] net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()
@ 2023-02-10 2:05 Hangyu Hua
2023-02-10 7:35 ` Eelco Chaudron
2023-02-13 9:40 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 4+ messages in thread
From: Hangyu Hua @ 2023-02-10 2:05 UTC (permalink / raw)
To: pshelar, davem, edumazet, kuba, pabeni, xiangxia.m.yue,
simon.horman, echaudro
Cc: netdev, dev, linux-kernel, Hangyu Hua
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>
---
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, struct genl_info *info)
err = 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, struct 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3] net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()
2023-02-10 2:05 [PATCH v3] net: openvswitch: fix possible memory leak in ovs_meter_cmd_set() Hangyu Hua
@ 2023-02-10 7:35 ` Eelco Chaudron
2023-02-10 8:49 ` Simon Horman
2023-02-13 9:40 ` patchwork-bot+netdevbpf
1 sibling, 1 reply; 4+ messages in thread
From: Eelco Chaudron @ 2023-02-10 7:35 UTC (permalink / raw)
To: Hangyu Hua
Cc: pshelar, davem, edumazet, kuba, pabeni, xiangxia.m.yue,
simon.horman, netdev, dev, linux-kernel
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 number")
> 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, struct genl_info *info)
>
> err = 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, struct 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()
2023-02-10 7:35 ` Eelco Chaudron
@ 2023-02-10 8:49 ` Simon Horman
0 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2023-02-10 8:49 UTC (permalink / raw)
To: Eelco Chaudron
Cc: Hangyu Hua, pshelar, davem, edumazet, kuba, pabeni,
xiangxia.m.yue, netdev, dev, linux-kernel
On Fri, Feb 10, 2023 at 08:35:50AM +0100, Eelco Chaudron wrote:
>
>
> 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 number")
> > 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>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()
2023-02-10 2:05 [PATCH v3] net: openvswitch: fix possible memory leak in ovs_meter_cmd_set() Hangyu Hua
2023-02-10 7:35 ` Eelco Chaudron
@ 2023-02-13 9:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-02-13 9:40 UTC (permalink / raw)
To: Hangyu Hua
Cc: pshelar, davem, edumazet, kuba, pabeni, xiangxia.m.yue,
simon.horman, echaudro, netdev, dev, linux-kernel
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:
On Fri, 10 Feb 2023 10:05:51 +0800 you 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>
> ---
>
> [...]
Here is the summary with links:
- [v3] net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()
https://git.kernel.org/netdev/net/c/2fa28f5c6fcb
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-13 9:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-10 2:05 [PATCH v3] net: openvswitch: fix possible memory leak in ovs_meter_cmd_set() Hangyu Hua
2023-02-10 7:35 ` Eelco Chaudron
2023-02-10 8:49 ` Simon Horman
2023-02-13 9:40 ` patchwork-bot+netdevbpf
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).