Commit 1418a3e5 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Linus Torvalds

TOMOYO: Fix pathname handling of disconnected paths.

Current tomoyo_realpath_from_path() implementation returns strange pathname
when calculating pathname of a file which belongs to lazy unmounted tree.
Use local pathname rather than strange absolute pathname in that case.

Also, this patch fixes a regression by commit 02125a82 "fix apparmor
dereferencing potentially freed dentry, sanitize __d_path() API".
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 34a9d2c3
...@@ -293,8 +293,16 @@ char *tomoyo_realpath_from_path(struct path *path) ...@@ -293,8 +293,16 @@ char *tomoyo_realpath_from_path(struct path *path)
pos = tomoyo_get_local_path(path->dentry, buf, pos = tomoyo_get_local_path(path->dentry, buf,
buf_len - 1); buf_len - 1);
/* Get absolute name for the rest. */ /* Get absolute name for the rest. */
else else {
pos = tomoyo_get_absolute_path(path, buf, buf_len - 1); 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: encode:
if (IS_ERR(pos)) if (IS_ERR(pos))
continue; continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment