diff options
| author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2014-08-20 07:14:04 +0200 |
|---|---|---|
| committer | Serge Hallyn <serge.hallyn@ubuntu.com> | 2014-08-27 04:52:09 +0200 |
| commit | 8fe7a268b18ebc89203c766b020b9e32f1cfeebf (patch) | |
| tree | de9400f69db6da34c7e3017c1a6bc8ca9f763e04 /security | |
| parent | Linux 3.17-rc2 (diff) | |
| download | linux-8fe7a268b18ebc89203c766b020b9e32f1cfeebf.tar.xz linux-8fe7a268b18ebc89203c766b020b9e32f1cfeebf.zip | |
tomoyo: Fix pathname calculation breakage.
Commit 7177a9c4b509 ("fs: call rename2 if exists") changed
"struct inode_operations"->rename == NULL if
"struct inode_operations"->rename2 != NULL .
TOMOYO needs to check for both ->rename and ->rename2 , or
a system on (e.g.) ext4 filesystem won't boot.
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/tomoyo/realpath.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c index a3386d119425..bed745c8b1a3 100644 --- a/security/tomoyo/realpath.c +++ b/security/tomoyo/realpath.c @@ -173,7 +173,7 @@ static char *tomoyo_get_local_path(struct dentry *dentry, char * const buffer, * Use filesystem name if filesystem does not support rename() * operation. */ - if (!inode->i_op->rename) + if (!inode->i_op->rename && !inode->i_op->rename2) goto prepend_filesystem_name; } /* Prepend device name. */ @@ -282,7 +282,8 @@ char *tomoyo_realpath_from_path(struct path *path) * Get local name for filesystems without rename() operation * or dentry without vfsmount. */ - if (!path->mnt || !inode->i_op->rename) + if (!path->mnt || + (!inode->i_op->rename && !inode->i_op->rename2)) pos = tomoyo_get_local_path(path->dentry, buf, buf_len - 1); /* Get absolute name for the rest. */ |