diff options
author | John Stultz <john.stultz@linaro.org> | 2011-10-26 13:48:49 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-10-26 13:48:49 -0700 |
commit | 2216773fc021964a413409141d439de4f6a108f7 (patch) | |
tree | 7b2f8cdcdf5fb05d75bd92f0c8d9ac635ceec48c /net/bluetooth/l2cap_sock.c | |
parent | 42ac8ca89aef66618e8ae2d6e48e3f523bfcd69d (diff) | |
parent | af1bdb79ca64ceadc7b44b11929b384eff66ce59 (diff) |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.10-2-android-0
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
-rw-r--r-- | net/bluetooth/l2cap_sock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 61f1f623091..e8292369cdc 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -26,6 +26,8 @@ /* Bluetooth L2CAP sockets. */ +#include <linux/security.h> + #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> #include <net/bluetooth/l2cap.h> @@ -933,6 +935,8 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent) chan->force_reliable = pchan->force_reliable; chan->flushable = pchan->flushable; chan->force_active = pchan->force_active; + + security_sk_clone(parent, sk); } else { switch (sk->sk_type) { |