Commit 2fa28f5c authored by Hangyu Hua's avatar Hangyu Hua Committed by David S. Miller
Browse files

net: openvswitch: fix possible memory leak in ovs_meter_cmd_set() 



old_meter needs to be free after it is detached regardless of whether
the new meter is successfully attached.

Fixes: c7c4c44c ("net: openvswitch: expand the meters supported number")
Signed-off-by: default avatarHangyu Hua <hbh25y@gmail.com>
Acked-by: default avatarEelco Chaudron <echaudro@redhat.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2f479651

net/openvswitch/meter.c

+3 −1
Original line number Diff line number Diff line
@@ -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);