mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-09 12:17:12 +09:00
net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()
commit2fa28f5c6fupstream. old_meter needs to be free after it is detached regardless of whether the new meter is successfully attached. Fixes:c7c4c44c9a("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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
525bdcb083
commit
c0f65ee0a3
@@ -450,7 +450,7 @@ static int ovs_meter_cmd_set(struct sk_buff *skb, struct genl_info *info)
|
|||||||
|
|
||||||
err = attach_meter(meter_tbl, meter);
|
err = attach_meter(meter_tbl, meter);
|
||||||
if (err)
|
if (err)
|
||||||
goto exit_unlock;
|
goto exit_free_old_meter;
|
||||||
|
|
||||||
ovs_unlock();
|
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);
|
genlmsg_end(reply, ovs_reply_header);
|
||||||
return genlmsg_reply(reply, info);
|
return genlmsg_reply(reply, info);
|
||||||
|
|
||||||
|
exit_free_old_meter:
|
||||||
|
ovs_meter_free(old_meter);
|
||||||
exit_unlock:
|
exit_unlock:
|
||||||
ovs_unlock();
|
ovs_unlock();
|
||||||
nlmsg_free(reply);
|
nlmsg_free(reply);
|
||||||
|
|||||||
Reference in New Issue
Block a user