diff --git a/[refs] b/[refs]
index 8678979da0f3..81eb1a70ca80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de45e806a84909648623119dfe6fc1d31e71ceba
+refs/heads/master: ea6b184f7d521a503ecab71feca6e4057562252b
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index 89f446d86054..4a7374c12d9c 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/security/selinux/hooks.c
@@ -1291,7 +1291,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
 		/* Default to the fs superblock SID. */
 		isec->sid = sbsec->sid;
 
-		if (sbsec->proc) {
+		if (sbsec->proc && !S_ISLNK(inode->i_mode)) {
 			struct proc_inode *proci = PROC_I(inode);
 			if (proci->pde) {
 				isec->sclass = inode_mode_to_security_class(inode->i_mode);