[svn-commits] sruffell: branch linux/2.6 r10631 - /linux/branches/2.6/drivers/dahdi/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Apr  3 15:10:16 2012
New Revision: 10631

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10631
Log:
dahdi_dynamic_eth: Make ztdeth_exit() symetrical with ztdeth_init() and fix race on unload.

Minor change to follow generally recommended practice. Prevents new packets
from being queued up for devices when they are about to be cleaned up. Also
clean up any skbs that may still be on the queue after unloading.

Also closes anoter potential kernel oops on module unload. It was possible to
delete the private structure while the master span process was running. The
result was an attempt to page memory from interrupt context.

Make sure that the pvt function is set and cleared under the zlock. Also do
not assume that the pvt pointer is valid in ztdeth_transmit.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10626

Modified:
    linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c

Modified: linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c?view=diff&rev=10631&r1=10630&r2=10631
==============================================================================
--- linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c (original)
+++ linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c Tue Apr  3 15:10:16 2012
@@ -154,7 +154,7 @@
 
 	spin_lock_irqsave(&zlock, flags);
 	z = dyn->pvt;
-	if (z->dev) {
+	if (z && z->dev) {
 		/* Copy fields to local variables to remove spinlock ASAP */
 		dev = z->dev;
 		memcpy(addr, z->addr, sizeof(z->addr));
@@ -315,11 +315,12 @@
 		prev = cur;
 		cur = cur->next;
 	}
-	spin_unlock_irqrestore(&zlock, flags);
 	if (cur == z) {	/* Successfully removed */
+		dyn->pvt = NULL;
 		printk(KERN_INFO "TDMoE: Removed interface for %s\n", z->span->name);
 		kfree(z);
 	}
+	spin_unlock_irqrestore(&zlock, flags);
 }
 
 static int ztdeth_create(struct dahdi_dynamic *dyn, const char *addr)
@@ -442,12 +443,12 @@
 
 static int __init ztdeth_init(void)
 {
+	skb_queue_head_init(&skbs);
+
 	dev_add_pack(&ztdeth_ptype);
 	register_netdevice_notifier(&ztdeth_nblock);
 	dahdi_dynamic_register_driver(&ztd_eth);
 
-	skb_queue_head_init(&skbs);
-
 	return 0;
 }
 
@@ -458,9 +459,11 @@
 #else
 	cancel_work_sync(&dahdi_dynamic_eth_flush_work);
 #endif
+	dahdi_dynamic_unregister_driver(&ztd_eth);
+	unregister_netdevice_notifier(&ztdeth_nblock);
 	dev_remove_pack(&ztdeth_ptype);
-	unregister_netdevice_notifier(&ztdeth_nblock);
-	dahdi_dynamic_unregister_driver(&ztd_eth);
+
+	skb_queue_purge(&skbs);
 }
 
 MODULE_DESCRIPTION("DAHDI Dynamic TDMoE Support");