Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1bd473f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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.
parents ff0c57ac 8fe7a268

security/tomoyo/realpath.c

+3 −2
Original line number Diff line number Diff line
@@ -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. */