-stable review patch.  If anyone has any objections, please let us know.

----

From: Ralf Baechle DL5RB <[EMAIL PROTECTED]>

When destroying a socket ax25_destroy_socket tries to stop the protocol's
T1 timer before freeing the memory.  If things are just right using the
non-sync variant of del_timer means the timer will continue to run even
after the del_timer because it's adding itself again which is likely to
result in a crash when the timer is executed again a few seconds later.

del_timer_sync can be expensive, so I don't want this one to go into 2.6
mainline where I'll try to cook something that is less intrusive than
regular calls to del_timer_sync.

Signed-off-by: Ralf Baechle DL5RB <[EMAIL PROTECTED]>
Signed-off-by: Chris Wright <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>

--- bk-afu.orig/net/ax25/ax25_timer.c   2005-03-08 13:54:06.000000000 +0000
+++ bk-afu/net/ax25/ax25_timer.c        2005-03-08 16:43:34.790532976 +0000
@@ -106,7 +106,7 @@
 
 void ax25_stop_t1timer(ax25_cb *ax25)
 {
-       del_timer(&ax25->t1timer);
+       del_timer_sync(&ax25->t1timer);
 }
 
 void ax25_stop_t2timer(ax25_cb *ax25)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to