Commit 95ff9f4d authored by Ralf Baechle's avatar Ralf Baechle Committed by David S. Miller
Browse files

[AX.25]: Fix locking of ax25 protocol function list. 



Delivery of AX.25 frame to the layer 3 protocols happens in softirq
context so locking needs to be bh-proof.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e55ffac6

net/ax25/ax25_iface.c

+9 −9
Original line number Diff line number Diff line
@@ -66,10 +66,10 @@ int ax25_protocol_register(unsigned int pid, 
	protocol->pid  = pid;

	protocol->func = func;



	write_lock(&protocol_list_lock);

	write_lock_bh(&protocol_list_lock);

	protocol->next = protocol_list;

	protocol_list  = protocol;

	write_unlock(&protocol_list_lock);

	write_unlock_bh(&protocol_list_lock);



	return 1;

}
@@ -80,16 +80,16 @@ void ax25_protocol_release(unsigned int pid) 
{

	struct protocol_struct *s, *protocol;



	write_lock(&protocol_list_lock);

	write_lock_bh(&protocol_list_lock);

	protocol = protocol_list;

	if (protocol == NULL) {

		write_unlock(&protocol_list_lock);

		write_unlock_bh(&protocol_list_lock);

		return;

	}



	if (protocol->pid == pid) {

		protocol_list = protocol->next;

		write_unlock(&protocol_list_lock);

		write_unlock_bh(&protocol_list_lock);

		kfree(protocol);

		return;

	}
@@ -98,14 +98,14 @@ void ax25_protocol_release(unsigned int pid) 
		if (protocol->next->pid == pid) {

			s = protocol->next;

			protocol->next = protocol->next->next;

			write_unlock(&protocol_list_lock);

			write_unlock_bh(&protocol_list_lock);

			kfree(s);

			return;

		}



		protocol = protocol->next;

	}

	write_unlock(&protocol_list_lock);

	write_unlock_bh(&protocol_list_lock);

}



EXPORT_SYMBOL(ax25_protocol_release);
@@ -266,13 +266,13 @@ int ax25_protocol_is_registered(unsigned int pid) 
	struct protocol_struct *protocol;

	int res = 0;



	read_lock(&protocol_list_lock);

	read_lock_bh(&protocol_list_lock);

	for (protocol = protocol_list; protocol != NULL; protocol = protocol->next)

		if (protocol->pid == pid) {

			res = 1;

			break;

		}

	read_unlock(&protocol_list_lock);

	read_unlock_bh(&protocol_list_lock);



	return res;

}