aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/cmtp
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2006-10-15 11:31:14 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-10-16 02:14:34 -0400
commit74da626a1098640ddc40c0e3481c0cd41e8ec1e9 (patch)
tree65e6f72f07c0cccbb37b3b079d93276b061d9ade /net/bluetooth/cmtp
parentcb19d9ea2ce2bcbe291d3d48e3501dc4f33ba627 (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>
Diffstat (limited to 'net/bluetooth/cmtp')
-rw-r--r--net/bluetooth/cmtp/sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c
index 0547edd57734..53295d33dc5c 100644
--- a/net/bluetooth/cmtp/sock.c
+++ b/net/bluetooth/cmtp/sock.c
@@ -205,7 +205,7 @@ static int cmtp_sock_create(struct socket *sock, int protocol)
205 if (sock->type != SOCK_RAW) 205 if (sock->type != SOCK_RAW)
206 return -ESOCKTNOSUPPORT; 206 return -ESOCKTNOSUPPORT;
207 207
208 sk = sk_alloc(PF_BLUETOOTH, GFP_KERNEL, &cmtp_proto, 1); 208 sk = sk_alloc(PF_BLUETOOTH, GFP_ATOMIC, &cmtp_proto, 1);
209 if (!sk) 209 if (!sk)
210 return -ENOMEM; 210 return -ENOMEM;
211 211