android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sec-v3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security

Browse Source 
Pull tomoyo fix from Serge Hallyn.

* 'sec-v3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security:
  tomoyo: Fix pathname calculation breakage.
This commit is contained in:
Linus Torvalds 2014-08-27 17:32:37 -07:00
commit f1bd473f95
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/tomoyo/realpath.c
View File

@ -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() * Use filesystem name if filesystem does not support rename()
* operation. * operation.
*/ */
if (!inode->i_op->rename) if (!inode->i_op->rename && !inode->i_op->rename2)
goto prepend_filesystem_name; goto prepend_filesystem_name;
} }
/* Prepend device name. */ /* Prepend device name. */
@ -282,7 +282,8 @@ char *tomoyo_realpath_from_path(struct path *path)
* Get local name for filesystems without rename() operation * Get local name for filesystems without rename() operation
* or dentry without vfsmount. * 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, 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. */