diff options
author | David S. Miller <davem@davemloft.net> | 2011-10-25 00:18:09 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-25 00:18:09 +0200 |
commit | 1805b2f04855f07afe3a71d620a68f483b0ed74f (patch) | |
tree | b823b90f37f5404fcaef70f785c70112ca74a329 /net/bluetooth/rfcomm | |
parent | TCP: remove TCP_DEBUG (diff) | |
parent | net: Fix driver name for mdio-gpio.c (diff) | |
download | linux-1805b2f04855f07afe3a71d620a68f483b0ed74f.tar.xz linux-1805b2f04855f07afe3a71d620a68f483b0ed74f.zip |
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bluetooth/rfcomm')
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 482722bbc7a0..5417f6127323 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -42,6 +42,7 @@ #include <linux/device.h> #include <linux/debugfs.h> #include <linux/seq_file.h> +#include <linux/security.h> #include <net/sock.h> #include <asm/system.h> @@ -264,6 +265,8 @@ static void rfcomm_sock_init(struct sock *sk, struct sock *parent) pi->sec_level = rfcomm_pi(parent)->sec_level; pi->role_switch = rfcomm_pi(parent)->role_switch; + + security_sk_clone(parent, sk); } else { pi->dlc->defer_setup = 0; |