diff options
| author |   James Morris <james.l.morris@oracle.com> | 2016-07-07 10:15:34 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-07-07 10:15:34 +1000 |
| commit | d011a4d861ce583466a8ae72a0c8e7f51c8cba4e (patch) | |
| tree | 1ff8dfe7d486f5648e69ee85e54cde1987d8296a /net/iucv/af_iucv.c | |
| parent | ima: extend the measurement entry specific pcr (diff) | |
| parent | netlabel: Implement CALIPSO config functions for SMACK. (diff) | |
| download | linux-dev-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.tar.xz linux-dev-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.zip | |
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'net/iucv/af_iucv.c')
| -rw-r--r-- | net/iucv/af_iucv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index fc3598a922b0..a0d1e36a284b 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -22,6 +22,7 @@ #include <linux/skbuff.h> #include <linux/init.h> #include <linux/poll.h> +#include <linux/security.h> #include <net/sock.h> #include <asm/ebcdic.h> #include <asm/cpcmd.h> @@ -530,8 +531,10 @@ static void iucv_sock_close(struct sock *sk) static void iucv_sock_init(struct sock *sk, struct sock *parent) { - if (parent) + if (parent) { sk->sk_type = parent->sk_type; + security_sk_clone(parent, sk); + } } static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio, int kern) |