提交 95ff9f4d 编写于 作者: R Ralf Baechle 提交者: David S. Miller

[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: NRalf Baechle <ralf@linux-mips.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 e55ffac6
......@@ -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;
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册