diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-25 20:38:15 +0100 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2007-01-26 20:49:22 +0100 |
commit | c2afb6058b25bc201d7ca24e2541941d09d03ae9 (patch) | |
tree | 97fcec4a42a3d4faa21ca188b74cba4ccd1a533c /net/bluetooth/l2cap.c | |
parent | ac4d63dab8bb425f1ae037abf349090c12f16883 (diff) |
[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>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'net/bluetooth/l2cap.c')
-rw-r--r-- | net/bluetooth/l2cap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index f6b4a8085357..fc1b54fb0ad2 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -414,7 +414,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; |