 21fab4a86a
			
		
	
	
	21fab4a86a
	
	
	
		
			
			According to one of Jann's OOPS reports it looks like BUG_ON(timer_pending(timer)) triggers during add_timer() in ax25_start_t1timer(). This patch changes current use of: init_timer(), add_timer() and del_timer() to setup_timer() with mod_timer(), which should be safer anyway. Reported-by: Jann Traschewski <jann@gmx.de> Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
		
			
				
	
	
		
			227 lines
		
	
	
	
		
			5.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			227 lines
		
	
	
	
		
			5.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * This program is free software; you can redistribute it and/or modify
 | |
|  * it under the terms of the GNU General Public License as published by
 | |
|  * the Free Software Foundation; either version 2 of the License, or
 | |
|  * (at your option) any later version.
 | |
|  *
 | |
|  * Copyright (C) Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk)
 | |
|  * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
 | |
|  * Copyright (C) Tomi Manninen OH2BNS (oh2bns@sral.fi)
 | |
|  * Copyright (C) Darryl Miles G7LED (dlm@g7led.demon.co.uk)
 | |
|  * Copyright (C) Joerg Reuter DL1BKE (jreuter@yaina.de)
 | |
|  * Copyright (C) Frederic Rible F1OAT (frible@teaser.fr)
 | |
|  * Copyright (C) 2002 Ralf Baechle DO1GRB (ralf@gnu.org)
 | |
|  */
 | |
| #include <linux/errno.h>
 | |
| #include <linux/types.h>
 | |
| #include <linux/socket.h>
 | |
| #include <linux/in.h>
 | |
| #include <linux/kernel.h>
 | |
| #include <linux/module.h>
 | |
| #include <linux/jiffies.h>
 | |
| #include <linux/timer.h>
 | |
| #include <linux/string.h>
 | |
| #include <linux/sockios.h>
 | |
| #include <linux/net.h>
 | |
| #include <net/ax25.h>
 | |
| #include <linux/inet.h>
 | |
| #include <linux/netdevice.h>
 | |
| #include <linux/skbuff.h>
 | |
| #include <net/sock.h>
 | |
| #include <asm/uaccess.h>
 | |
| #include <asm/system.h>
 | |
| #include <linux/fcntl.h>
 | |
| #include <linux/mm.h>
 | |
| #include <linux/interrupt.h>
 | |
| 
 | |
| static void ax25_heartbeat_expiry(unsigned long);
 | |
| static void ax25_t1timer_expiry(unsigned long);
 | |
| static void ax25_t2timer_expiry(unsigned long);
 | |
| static void ax25_t3timer_expiry(unsigned long);
 | |
| static void ax25_idletimer_expiry(unsigned long);
 | |
| 
 | |
| void ax25_setup_timers(ax25_cb *ax25)
 | |
| {
 | |
| 	setup_timer(&ax25->timer, ax25_heartbeat_expiry, (unsigned long)ax25);
 | |
| 	setup_timer(&ax25->t1timer, ax25_t1timer_expiry, (unsigned long)ax25);
 | |
| 	setup_timer(&ax25->t2timer, ax25_t2timer_expiry, (unsigned long)ax25);
 | |
| 	setup_timer(&ax25->t3timer, ax25_t3timer_expiry, (unsigned long)ax25);
 | |
| 	setup_timer(&ax25->idletimer, ax25_idletimer_expiry,
 | |
| 		    (unsigned long)ax25);
 | |
| }
 | |
| 
 | |
| void ax25_start_heartbeat(ax25_cb *ax25)
 | |
| {
 | |
| 	mod_timer(&ax25->timer, jiffies + 5 * HZ);
 | |
| }
 | |
| 
 | |
| void ax25_start_t1timer(ax25_cb *ax25)
 | |
| {
 | |
| 	mod_timer(&ax25->t1timer, jiffies + ax25->t1);
 | |
| }
 | |
| 
 | |
| void ax25_start_t2timer(ax25_cb *ax25)
 | |
| {
 | |
| 	mod_timer(&ax25->t2timer, jiffies + ax25->t2);
 | |
| }
 | |
| 
 | |
| void ax25_start_t3timer(ax25_cb *ax25)
 | |
| {
 | |
| 	if (ax25->t3 > 0)
 | |
| 		mod_timer(&ax25->t3timer, jiffies + ax25->t3);
 | |
| 	else
 | |
| 		del_timer(&ax25->t3timer);
 | |
| }
 | |
| 
 | |
| void ax25_start_idletimer(ax25_cb *ax25)
 | |
| {
 | |
| 	if (ax25->idle > 0)
 | |
| 		mod_timer(&ax25->idletimer, jiffies + ax25->idle);
 | |
| 	else
 | |
| 		del_timer(&ax25->idletimer);
 | |
| }
 | |
| 
 | |
| void ax25_stop_heartbeat(ax25_cb *ax25)
 | |
| {
 | |
| 	del_timer(&ax25->timer);
 | |
| }
 | |
| 
 | |
| void ax25_stop_t1timer(ax25_cb *ax25)
 | |
| {
 | |
| 	del_timer(&ax25->t1timer);
 | |
| }
 | |
| 
 | |
| void ax25_stop_t2timer(ax25_cb *ax25)
 | |
| {
 | |
| 	del_timer(&ax25->t2timer);
 | |
| }
 | |
| 
 | |
| void ax25_stop_t3timer(ax25_cb *ax25)
 | |
| {
 | |
| 	del_timer(&ax25->t3timer);
 | |
| }
 | |
| 
 | |
| void ax25_stop_idletimer(ax25_cb *ax25)
 | |
| {
 | |
| 	del_timer(&ax25->idletimer);
 | |
| }
 | |
| 
 | |
| int ax25_t1timer_running(ax25_cb *ax25)
 | |
| {
 | |
| 	return timer_pending(&ax25->t1timer);
 | |
| }
 | |
| 
 | |
| unsigned long ax25_display_timer(struct timer_list *timer)
 | |
| {
 | |
| 	if (!timer_pending(timer))
 | |
| 		return 0;
 | |
| 
 | |
| 	return timer->expires - jiffies;
 | |
| }
 | |
| 
 | |
| EXPORT_SYMBOL(ax25_display_timer);
 | |
| 
 | |
| static void ax25_heartbeat_expiry(unsigned long param)
 | |
| {
 | |
| 	int proto = AX25_PROTO_STD_SIMPLEX;
 | |
| 	ax25_cb *ax25 = (ax25_cb *)param;
 | |
| 
 | |
| 	if (ax25->ax25_dev)
 | |
| 		proto = ax25->ax25_dev->values[AX25_VALUES_PROTOCOL];
 | |
| 
 | |
| 	switch (proto) {
 | |
| 	case AX25_PROTO_STD_SIMPLEX:
 | |
| 	case AX25_PROTO_STD_DUPLEX:
 | |
| 		ax25_std_heartbeat_expiry(ax25);
 | |
| 		break;
 | |
| 
 | |
| #ifdef CONFIG_AX25_DAMA_SLAVE
 | |
| 	case AX25_PROTO_DAMA_SLAVE:
 | |
| 		if (ax25->ax25_dev->dama.slave)
 | |
| 			ax25_ds_heartbeat_expiry(ax25);
 | |
| 		else
 | |
| 			ax25_std_heartbeat_expiry(ax25);
 | |
| 		break;
 | |
| #endif
 | |
| 	}
 | |
| }
 | |
| 
 | |
| static void ax25_t1timer_expiry(unsigned long param)
 | |
| {
 | |
| 	ax25_cb *ax25 = (ax25_cb *)param;
 | |
| 
 | |
| 	switch (ax25->ax25_dev->values[AX25_VALUES_PROTOCOL]) {
 | |
| 	case AX25_PROTO_STD_SIMPLEX:
 | |
| 	case AX25_PROTO_STD_DUPLEX:
 | |
| 		ax25_std_t1timer_expiry(ax25);
 | |
| 		break;
 | |
| 
 | |
| #ifdef CONFIG_AX25_DAMA_SLAVE
 | |
| 	case AX25_PROTO_DAMA_SLAVE:
 | |
| 		if (!ax25->ax25_dev->dama.slave)
 | |
| 			ax25_std_t1timer_expiry(ax25);
 | |
| 		break;
 | |
| #endif
 | |
| 	}
 | |
| }
 | |
| 
 | |
| static void ax25_t2timer_expiry(unsigned long param)
 | |
| {
 | |
| 	ax25_cb *ax25 = (ax25_cb *)param;
 | |
| 
 | |
| 	switch (ax25->ax25_dev->values[AX25_VALUES_PROTOCOL]) {
 | |
| 	case AX25_PROTO_STD_SIMPLEX:
 | |
| 	case AX25_PROTO_STD_DUPLEX:
 | |
| 		ax25_std_t2timer_expiry(ax25);
 | |
| 		break;
 | |
| 
 | |
| #ifdef CONFIG_AX25_DAMA_SLAVE
 | |
| 	case AX25_PROTO_DAMA_SLAVE:
 | |
| 		if (!ax25->ax25_dev->dama.slave)
 | |
| 			ax25_std_t2timer_expiry(ax25);
 | |
| 		break;
 | |
| #endif
 | |
| 	}
 | |
| }
 | |
| 
 | |
| static void ax25_t3timer_expiry(unsigned long param)
 | |
| {
 | |
| 	ax25_cb *ax25 = (ax25_cb *)param;
 | |
| 
 | |
| 	switch (ax25->ax25_dev->values[AX25_VALUES_PROTOCOL]) {
 | |
| 	case AX25_PROTO_STD_SIMPLEX:
 | |
| 	case AX25_PROTO_STD_DUPLEX:
 | |
| 		ax25_std_t3timer_expiry(ax25);
 | |
| 		break;
 | |
| 
 | |
| #ifdef CONFIG_AX25_DAMA_SLAVE
 | |
| 	case AX25_PROTO_DAMA_SLAVE:
 | |
| 		if (ax25->ax25_dev->dama.slave)
 | |
| 			ax25_ds_t3timer_expiry(ax25);
 | |
| 		else
 | |
| 			ax25_std_t3timer_expiry(ax25);
 | |
| 		break;
 | |
| #endif
 | |
| 	}
 | |
| }
 | |
| 
 | |
| static void ax25_idletimer_expiry(unsigned long param)
 | |
| {
 | |
| 	ax25_cb *ax25 = (ax25_cb *)param;
 | |
| 
 | |
| 	switch (ax25->ax25_dev->values[AX25_VALUES_PROTOCOL]) {
 | |
| 	case AX25_PROTO_STD_SIMPLEX:
 | |
| 	case AX25_PROTO_STD_DUPLEX:
 | |
| 		ax25_std_idletimer_expiry(ax25);
 | |
| 		break;
 | |
| 
 | |
| #ifdef CONFIG_AX25_DAMA_SLAVE
 | |
| 	case AX25_PROTO_DAMA_SLAVE:
 | |
| 		if (ax25->ax25_dev->dama.slave)
 | |
| 			ax25_ds_idletimer_expiry(ax25);
 | |
| 		else
 | |
| 			ax25_std_idletimer_expiry(ax25);
 | |
| 		break;
 | |
| #endif
 | |
| 	}
 | |
| }
 |