netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] net/xen-netfront: only clean up queues if present
@ 2015-08-19 23:14 Charles (Chas) Williams
  2015-08-23 22:56 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Charles (Chas) Williams @ 2015-08-19 23:14 UTC (permalink / raw)
  To: netdev; +Cc: davem

From: Chas Williams <3chas3@gmail.com>

If you simply load and unload the module without starting the interfaces,
the queues are never created and you get a bad pointer dereference.

Signed-off-by: Chas Williams <3chas3@gmail.com>
---
 drivers/net/xen-netfront.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index f948c46..002062d 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1336,7 +1336,7 @@ static void xennet_disconnect_backend(struct netfront_info *info)
 
 	netif_carrier_off(info->netdev);
 
-	for (i = 0; i < num_queues; ++i) {
+	for (i = 0; i < num_queues && info->queues; ++i) {
 		struct netfront_queue *queue = &info->queues[i];
 
 		if (queue->tx_irq && (queue->tx_irq == queue->rx_irq))
@@ -2101,7 +2101,8 @@ static int xennet_remove(struct xenbus_device *dev)
 
 	unregister_netdev(info->netdev);
 
-	xennet_destroy_queues(info);
+	if (info->queues)
+		xennet_destroy_queues(info);
 	xennet_free_netdev(info->netdev);
 
 	return 0;
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH net-next] net/xen-netfront: only clean up queues if present
  2015-08-19 23:14 [PATCH net-next] net/xen-netfront: only clean up queues if present Charles (Chas) Williams
@ 2015-08-23 22:56 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-08-23 22:56 UTC (permalink / raw)
  To: 3chas3; +Cc: netdev

From: "Charles (Chas) Williams" <3chas3@gmail.com>
Date: Wed, 19 Aug 2015 19:14:20 -0400

> From: Chas Williams <3chas3@gmail.com>
> 
> If you simply load and unload the module without starting the interfaces,
> the queues are never created and you get a bad pointer dereference.
> 
> Signed-off-by: Chas Williams <3chas3@gmail.com>

Applied, thanks Chas.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-08-23 22:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-19 23:14 [PATCH net-next] net/xen-netfront: only clean up queues if present Charles (Chas) Williams
2015-08-23 22:56 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).