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>

diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index 6e38f68f88c26ca6ef9e0f817efa6c42aff595bd..f2698d2316dfcb8a8eeb19c30ca7a9c44290fa20 100644 (file)
--- 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);