From 7b8433a2fc113472ea3fce2ab12103b9f976fce7 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 5 Feb 2010 09:37:21 -0500 Subject: [PATCH] --- yaml --- r: 185729 b: refs/heads/master c: 440b3c6c160f7d0a985f24ad1f4c24e00ee2d936 h: refs/heads/master i: 185727: 3a939f95a4caebf446965117ae6dee64440270ad v: v3 --- [refs] | 2 +- trunk/security/tomoyo/realpath.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index aa4a1f154a5e..c5200657370d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ceeca5a08abb1d880f0cc0ea812ad14932070e0 +refs/heads/master: 440b3c6c160f7d0a985f24ad1f4c24e00ee2d936 diff --git a/trunk/security/tomoyo/realpath.c b/trunk/security/tomoyo/realpath.c index 6a4f8495f281..455bc391b76d 100644 --- a/trunk/security/tomoyo/realpath.c +++ b/trunk/security/tomoyo/realpath.c @@ -96,7 +96,7 @@ int tomoyo_realpath_from_path2(struct path *path, char *newname, sp = __d_path(path, &ns_root, newname, newname_len); spin_unlock(&dcache_lock); /* Prepend "/proc" prefix if using internal proc vfs mount. */ - if (!IS_ERR(sp) && (path->mnt->mnt_parent == path->mnt) && + if (!IS_ERR(sp) && (path->mnt->mnt_flags & MNT_INTERNAL) && (strcmp(path->mnt->mnt_sb->s_type->name, "proc") == 0)) { sp -= 5; if (sp >= newname)