From 1d7ad7a892039af362556072cc698633a8f76081 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 29 Sep 2006 15:50:25 -0700 Subject: [PATCH] --- yaml --- r: 37206 b: refs/heads/master c: 2148ccc437a9eac9f0d4b3c27cb1e41f6a48194c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d9006aa13011..37739f502395 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a69d1aeccf169d9a1e442c07d3a6e87f06a7b49 +refs/heads/master: 2148ccc437a9eac9f0d4b3c27cb1e41f6a48194c diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index cac0273ec447..e9969a2fc846 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -3619,7 +3619,9 @@ static void selinux_sock_graft(struct sock* sk, struct socket *parent) struct inode_security_struct *isec = SOCK_INODE(parent)->i_security; struct sk_security_struct *sksec = sk->sk_security; - isec->sid = sksec->sid; + if (sk->sk_family == PF_INET || sk->sk_family == PF_INET6 || + sk->sk_family == PF_UNIX) + isec->sid = sksec->sid; selinux_netlbl_sock_graft(sk, parent); }