From 61666dd6311f7417697f7fa4609adc068307f272 Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Date: Wed, 9 Dec 2009 15:36:04 +0900
Subject: [PATCH] --- yaml --- r: 184893 b: refs/heads/master c:
 67fa4880c5e059428392ca6f7c2f9c38e8546fea h: refs/heads/master i:   184891:
 11d1c00f64b4a6d2c30e873d86ee39d7041c2311 v: v3

---
 [refs]                           | 2 +-
 trunk/security/tomoyo/realpath.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 891197dc8cc8..555bf93ea69c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ad1f10cd915744bbe52b19423653b38287d827d
+refs/heads/master: 67fa4880c5e059428392ca6f7c2f9c38e8546fea
diff --git a/trunk/security/tomoyo/realpath.c b/trunk/security/tomoyo/realpath.c
index 18369d497eb8..e3c7aa0fb706 100644
--- a/trunk/security/tomoyo/realpath.c
+++ b/trunk/security/tomoyo/realpath.c
@@ -14,6 +14,7 @@
 #include <linux/mnt_namespace.h>
 #include <linux/fs_struct.h>
 #include <linux/hash.h>
+#include <linux/magic.h>
 
 #include "common.h"
 #include "realpath.h"
@@ -112,7 +113,7 @@ int tomoyo_realpath_from_path2(struct path *path, char *newname,
 		path_put(&ns_root);
 		/* Prepend "/proc" prefix if using internal proc vfs mount. */
 		if (!IS_ERR(sp) && (path->mnt->mnt_parent == path->mnt) &&
-		    (strcmp(path->mnt->mnt_sb->s_type->name, "proc") == 0)) {
+		    (path->mnt->mnt_sb->s_magic == PROC_SUPER_MAGIC)) {
 			sp -= 5;
 			if (sp >= newname)
 				memcpy(sp, "/proc", 5);