Skip to contentSkip to conversation

hso: fix for crash when unplugging the device

PATCH In review Jan Dumon 2 participants 2 messages Apr 2, 2009

Subsystems (4)
lore
Share & tools
lore

Jan Dumon

author
#0 lore raw

PATCH 1/2 hso: fix for crash when unplugging the device

From: Jan Dumon <[email protected]>

Changed the order in which things are freed. This fixes an oops when unplugging the device while network traffic is ongoing.

---

drivers/net/usb/hso.c +9 -2
index 28d1424..779a007 100644
@@ -5,6 +5,7 @@
  *  Copyright (C) 2008 Option International
  *                     Filip Aben <[email protected]>
  *                     Denis Joseph Barrow <[email protected]>
+ *                     Jan Dumon <[email protected]>
  *  Copyright (C) 2007 Andrew Bird (Sphere Systems Ltd)
  *  			<ajb-5+cxppFmGx6/3pe1ocb+s/[email protected]>
  *  Copyright (C) 2008 Greg Kroah-Hartman <[email protected]>
@@ -2417,20 +2418,22 @@ static void hso_free_net_device(struct hso_device *hso_dev)
 	if (!hso_net)
 		return;
 
+	remove_net_device(hso_net->parent);
+
+	if (hso_net->net) {
+		unregister_netdev(hso_net->net);
+		free_netdev(hso_net->net);
+	}
+
 	/* start freeing */
 	for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
 		usb_free_urb(hso_net->mux_bulk_rx_urb_pool[i]);
 		kfree(hso_net->mux_bulk_rx_buf_pool[i]);
+		hso_net->mux_bulk_rx_buf_pool[i] = NULL;
 	}
 	usb_free_urb(hso_net->mux_bulk_tx_urb);
 	kfree(hso_net->mux_bulk_tx_buf);
-
-	remove_net_device(hso_net->parent);