---

yaml --- r: 276485 b: refs/heads/master c: 1418a3e h: refs/heads/master i: 276483: 8f802f7 v: v3
git-mirror · Dec 8, 2011 · 150579c · 150579c
1 parent dbf165c
commit 150579c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34a9d2c39afe74a941b9e88efe2762afc4d82443
+refs/heads/master: 1418a3e5ad4d01b1d4abf2c479c50b0cedd59e3f
diff --git a/trunk/security/tomoyo/realpath.c b/trunk/security/tomoyo/realpath.c
@@ -293,8 +293,16 @@ char *tomoyo_realpath_from_path(struct path *path)
 			pos = tomoyo_get_local_path(path->dentry, buf,
 						    buf_len - 1);
 		/* Get absolute name for the rest. */
-		else
+		else {
 			pos = tomoyo_get_absolute_path(path, buf, buf_len - 1);
+			/*
+			 * Fall back to local name if absolute name is not
+			 * available.
+			 */
+			if (pos == ERR_PTR(-EINVAL))
+				pos = tomoyo_get_local_path(path->dentry, buf,
+							    buf_len - 1);
+		}
 encode:
 		if (IS_ERR(pos))
 			continue;