Commit e656a8eb authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

TOMOYO: Use d_is_dir() rather than d_inode and S_ISDIR() 



Use d_is_dir() rather than d_inode and S_ISDIR().  Note that this will include
fake directories such as automount triggers.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 729b8a3d

security/tomoyo/file.c

+1 −3
Original line number Diff line number Diff line
@@ -905,11 +905,9 @@ int tomoyo_path2_perm(const u8 operation, struct path *path1, 
	    !tomoyo_get_realpath(&buf2, path2))

		goto out;

	switch (operation) {

		struct dentry *dentry;

	case TOMOYO_TYPE_RENAME:

	case TOMOYO_TYPE_LINK:

		dentry = path1->dentry;

		if (!dentry->d_inode || !S_ISDIR(dentry->d_inode->i_mode))

		if (!d_is_dir(path1->dentry))

			break;

		/* fall through */

	case TOMOYO_TYPE_PIVOT_ROOT: