Commit 1586a703 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pull-tomoyo' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc tomoyo changes from Al Viro:
 "A couple of assorted tomoyo patches"

* tag 'pull-tomoyo' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  tomoyo: struct path it might get from LSM callers won't have NULL dentry or mnt
  tomoyo: use vsnprintf() properly
parents ab296221 467cf8ef

security/tomoyo/audit.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ void tomoyo_write_log(struct tomoyo_request_info *r, const char *fmt, ...) 
	int len;



	va_start(args, fmt);

	len = vsnprintf((char *) &len, 1, fmt, args) + 1;

	len = vsnprintf(NULL, 0, fmt, args) + 1;

	va_end(args);

	va_start(args, fmt);

	tomoyo_write_log2(r, len, fmt, args);

security/tomoyo/common.c

+1 −1
Original line number Diff line number Diff line
@@ -2057,7 +2057,7 @@ int tomoyo_supervisor(struct tomoyo_request_info *r, const char *fmt, ...) 
	bool quota_exceeded = false;



	va_start(args, fmt);

	len = vsnprintf((char *) &len, 1, fmt, args) + 1;

	len = vsnprintf(NULL, 0, fmt, args) + 1;

	va_end(args);

	/* Write /sys/kernel/security/tomoyo/audit. */

	va_start(args, fmt);

security/tomoyo/file.c

+1 −1
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ int tomoyo_path_number_perm(const u8 type, const struct path *path, 
	int idx;



	if (tomoyo_init_request_info(&r, NULL, tomoyo_pn2mac[type])

	    == TOMOYO_CONFIG_DISABLED || !path->dentry)

	    == TOMOYO_CONFIG_DISABLED)

		return 0;

	idx = tomoyo_read_lock();

	if (!tomoyo_get_realpath(&buf, path))

security/tomoyo/realpath.c

+2 −7
Original line number Diff line number Diff line
@@ -240,11 +240,8 @@ char *tomoyo_realpath_from_path(const struct path *path) 
	char *name = NULL;

	unsigned int buf_len = PAGE_SIZE / 2;

	struct dentry *dentry = path->dentry;

	struct super_block *sb;

	struct super_block *sb = dentry->d_sb;



	if (!dentry)

		return NULL;

	sb = dentry->d_sb;

	while (1) {

		char *pos;

		struct inode *inode;
@@ -264,10 +261,8 @@ char *tomoyo_realpath_from_path(const struct path *path) 
		inode = d_backing_inode(sb->s_root);

		/*

		 * Get local name for filesystems without rename() operation

		 * or dentry without vfsmount.

		 */

		if (!path->mnt ||

		    (!inode->i_op->rename &&

		if ((!inode->i_op->rename &&

		     !(sb->s_type->fs_flags & FS_REQUIRES_DEV)))

			pos = tomoyo_get_local_path(path->dentry, buf,

						    buf_len - 1);