aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2006-10-15 17:31:14 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2006-10-15 23:14:34 -0700
commit74da626a1098640ddc40c0e3481c0cd41e8ec1e9 (patch)
tree65e6f72f07c0cccbb37b3b079d93276b061d9ade /net/bluetooth/l2cap.c
parentcb19d9ea2ce2bcbe291d3d48e3501dc4f33ba627 (diff)
downloadkernel_samsung_crespo-74da626a1098640ddc40c0e3481c0cd41e8ec1e9.zip
kernel_samsung_crespo-74da626a1098640ddc40c0e3481c0cd41e8ec1e9.tar.gz
kernel_samsung_crespo-74da626a1098640ddc40c0e3481c0cd41e8ec1e9.tar.bz2
[Bluetooth] Add locking for bt_proto array manipulation
The bt_proto array needs to be protected by some kind of locking to prevent a race condition between bt_sock_create and bt_sock_register. And in addition all calls to sk_alloc need to be made GFP_ATOMIC now. Signed-off-by: Masatake YAMATO <jet@gyve.org> Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/l2cap.c')
-rw-r--r--net/bluetooth/l2cap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 66fc621..2b3dcb8 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -559,7 +559,7 @@ static int l2cap_sock_create(struct socket *sock, int protocol)
sock->ops = &l2cap_sock_ops;
- sk = l2cap_sock_alloc(sock, protocol, GFP_KERNEL);
+ sk = l2cap_sock_alloc(sock, protocol, GFP_ATOMIC);
if (!sk)
return -ENOMEM;