Эх сурвалжийг харах

xen-netback: fix memory leaks on XenBus disconnect

Eliminate memory leaks introduced several years ago by cleaning the
queue resources which are allocated on XenBus connection event. Namely, queue
structure array and pages used for IO rings.

Signed-off-by: Igor Druzhinin <igor.druzhinin@citrix.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Igor Druzhinin 8 жил өмнө
parent
commit
9a6cdf52b8

+ 11 - 0
drivers/net/xen-netback/xenbus.c

@@ -493,11 +493,20 @@ static int backend_create_xenvif(struct backend_info *be)
 static void backend_disconnect(struct backend_info *be)
 static void backend_disconnect(struct backend_info *be)
 {
 {
 	if (be->vif) {
 	if (be->vif) {
+		unsigned int queue_index;
+
 		xen_unregister_watchers(be->vif);
 		xen_unregister_watchers(be->vif);
 #ifdef CONFIG_DEBUG_FS
 #ifdef CONFIG_DEBUG_FS
 		xenvif_debugfs_delif(be->vif);
 		xenvif_debugfs_delif(be->vif);
 #endif /* CONFIG_DEBUG_FS */
 #endif /* CONFIG_DEBUG_FS */
 		xenvif_disconnect_data(be->vif);
 		xenvif_disconnect_data(be->vif);
+		for (queue_index = 0; queue_index < be->vif->num_queues; ++queue_index)
+			xenvif_deinit_queue(&be->vif->queues[queue_index]);
+
+		vfree(be->vif->queues);
+		be->vif->num_queues = 0;
+		be->vif->queues = NULL;
+
 		xenvif_disconnect_ctrl(be->vif);
 		xenvif_disconnect_ctrl(be->vif);
 	}
 	}
 }
 }
@@ -1034,6 +1043,8 @@ static void connect(struct backend_info *be)
 err:
 err:
 	if (be->vif->num_queues > 0)
 	if (be->vif->num_queues > 0)
 		xenvif_disconnect_data(be->vif); /* Clean up existing queues */
 		xenvif_disconnect_data(be->vif); /* Clean up existing queues */
+	for (queue_index = 0; queue_index < be->vif->num_queues; ++queue_index)
+		xenvif_deinit_queue(&be->vif->queues[queue_index]);
 	vfree(be->vif->queues);
 	vfree(be->vif->queues);
 	be->vif->queues = NULL;
 	be->vif->queues = NULL;
 	be->vif->num_queues = 0;
 	be->vif->num_queues = 0;