net: openvswitch: release vport resources on failure
Subsystems (3)
Aaron Conole
maintainerPATCH 1/1 net: openvswitch: release vport resources on failure
A recent commit introducing upcall packet accounting failed to properly release the vport object when the per-cpu stats struct couldn't be allocated. This can cause dangling pointers to dp objects long after they've been released.
--- net/openvswitch/datapath.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/openvswitch/datapath.c +6 -2
@@ -1854,7 +1854,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) vport->upcall_stats = netdev_alloc_pcpu_stats(struct vport_upcall_stats_percpu);if (!vport->upcall_stats) { err = -ENOMEM ; - goto err_destroy_portids; + goto err_destroy_vport; } err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,
@@ -1869,6 +1869,8 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)ovs_notify (&dp_datapath_genl_family, reply, info);return 0 ; +err_destroy_vport: +ovs_dp_detach_port (vport); err_destroy_portids:kfree (rcu_dereference_raw (dp->upcall_portids)); err_unlock_and_destroy_meters:
@@ -2316,7 +2318,7 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info) vport->upcall_stats = netdev_alloc_pcpu_stats(struct vport_upcall_stats_percpu);if (!vport->upcall_stats) { err = -ENOMEM ; - goto exit_unlock_free; + goto exit_unlock_free_vport; } err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
@@ -2336,6 +2338,8 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)ovs_notify (&dp_vport_genl_family, reply, info);return 0 ; +exit_unlock_free_vport: +ovs_dp_detach_port (vport); exit_unlock_free:ovs_unlock ();kfree_skb (reply);
Signature · 1 line
2.31.1
Quoted 11 lines · Aaron Conole
A recent commit introducing upcall packet accounting failed to properly release the vport object when the per-cpu stats struct couldn't be allocated. This can cause dangling pointers to dp objects long after they've been released.
Cc Eelco Chaudron <[email protected]>Cc wangchuanlei <[email protected]>Fixes 1933ea365aa7 ("net: openvswitch: Add support to count upcall packets")Reported-by [email protected]Signed-off-by Aaron Conole <[email protected]>---
Thanks for finding and fixing this! The changes look good to me.
Quoted 45 lines
net/openvswitch/datapath.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)net/openvswitch/datapath.c +6
-2@@ -1854,7 +1854,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) vport->upcall_stats = netdev_alloc_pcpu_stats(struct vport_upcall_stats_percpu);if (!vport->upcall_stats) { err = -ENOMEM ; - goto err_destroy_portids; + goto err_destroy_vport; } err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,@@ -1869,6 +1869,8 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)ovs_notify (&dp_datapath_genl_family, reply, info);return 0 ; +err_destroy_vport: +ovs_dp_detach_port (vport); err_destroy_portids:kfree (rcu_dereference_raw (dp->upcall_portids)); err_unlock_and_destroy_meters:@@ -2316,7 +2318,7 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info) vport->upcall_stats = netdev_alloc_pcpu_stats(struct vport_upcall_stats_percpu);if (!vport->upcall_stats) { err = -ENOMEM ; - goto exit_unlock_free; + goto exit_unlock_free_vport; } err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),@@ -2336,6 +2338,8 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)ovs_notify (&dp_vport_genl_family, reply, info);return 0 ; +exit_unlock_free_vport: +ovs_dp_detach_port (vport); exit_unlock_free:ovs_unlock ();kfree_skb (reply);Signature · 1 line
2.31.1
Quoted 11 lines · Aaron Conole
A recent commit introducing upcall packet accounting failed to properly release the vport object when the per-cpu stats struct couldn't be allocated. This can cause dangling pointers to dp objects long after they've been released.
Cc Eelco Chaudron <[email protected]>Cc wangchuanlei <[email protected]>Fixes 1933ea365aa7 ("net: openvswitch: Add support to count upcall packets")Reported-by [email protected]Signed-off-by Aaron Conole <[email protected]>---
Looks good, thanks
Quoted 3 lines
Signature · 1 line
2.31.1
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 5 lines · On Tue, 20 Dec 2022 16:27:17 -0500 you wrote:
A recent commit introducing upcall packet accounting failed to properly release the vport object when the per-cpu stats struct couldn't be allocated. This can cause dangling pointers to dp objects long after they've been released.
Quoted 7 lines
Cc Eelco Chaudron <[email protected]>Cc wangchuanlei <[email protected]>Fixes 1933ea365aa7 ("net: openvswitch: Add support to count upcall packets")Reported-by [email protected]Signed-off-by Aaron Conole <[email protected]>[...]
Here is the summary with links:
- [net] net: openvswitch: release vport resources on failure
https://git.kernel.org/netdev/net/c/95637d91fefd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html