AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

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

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ralf Baechle 2006-07-10 16:21:29 -07:00 committed by David S. Miller
parent e55ffac601
commit 95ff9f4d3c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/ax25/ax25_iface.c
View File

@ -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;
}