summaryrefslogtreecommitdiff
path: root/net/openvswitch
diff options
context:
space:
mode:
authorHangyu Hua <hbh25y@gmail.com>2023-02-10 05:05:51 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-22 14:55:57 +0300
commitc0f65ee0a3329eb4b94beaef0268633696e2d0c6 (patch)
tree290cefe4422e9ea613e838cdcfa1f487c0be530b /net/openvswitch
parent525bdcb0838d19d918c7786151ee14661967a030 (diff)
downloadlinux-c0f65ee0a3329eb4b94beaef0268633696e2d0c6.tar.xz
net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()
commit 2fa28f5c6fcbfc794340684f36d2581b4f2d20b5 upstream. 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> Acked-by: Eelco Chaudron <echaudro@redhat.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/openvswitch')
-rw-r--r--net/openvswitch/meter.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index e594b4d6b58a..0cf3dda5319f 100644
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -450,7 +450,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();
@@ -473,6 +473,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);