Merge branch 'next' into for-linus

1 files changed, 9 insertions, 4 deletions

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 69c9dccc8cf0..c86303638235 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -95,13 +95,18 @@ extern void selnl_notify_setenforce(int val);
 static int task_has_security(struct task_struct *tsk,
                              u32 perms)
 {
-        struct task_security_struct *tsec;
-
-        tsec = tsk->security;
+        const struct task_security_struct *tsec;
+        u32 sid = 0;
+
+        rcu_read_lock();
+        tsec = __task_cred(tsk)->security;
+        if (tsec)
+                sid = tsec->sid;
+        rcu_read_unlock();
         if (!tsec)
                 return -EACCES;
 
-        return avc_has_perm(tsec->sid, SECINITSID_SECURITY,
+        return avc_has_perm(sid, SECINITSID_SECURITY,
                             SECCLASS_SECURITY, perms, NULL);
 }