---

yaml --- r: 97607 b: refs/heads/master c: e97dcb0 h: refs/heads/master i: 97605: b5780ca 97603: ccbf048 97599: 5194749 v: v3
git-mirror · Jun 4, 2008 · 0806917 · 0806917
1 parent 6e59d33
commit 0806917
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 246dd412d31e4f5de1d43aa6422a325b785f36e4
+refs/heads/master: e97dcb0eadbb821eccd549d4987b653cf61e2374
diff --git a/trunk/security/smack/smack_lsm.c b/trunk/security/smack/smack_lsm.c
@@ -1880,6 +1880,18 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
 	 */
 	final = sbsp->smk_default;
 
+	/*
+	 * If this is the root inode the superblock
+	 * may be in the process of initialization.
+	 * If that is the case use the root value out
+	 * of the superblock.
+	 */
+	if (opt_dentry->d_parent == opt_dentry) {
+		isp->smk_inode = sbsp->smk_root;
+		isp->smk_flags |= SMK_INODE_INSTANT;
+		goto unlockandout;
+	}
+
 	/*
 	 * This is pretty hackish.
 	 * Casey says that we shouldn't have to do