Commit 53e5e7a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs namei updates from Al Viro:
 "Pathwalk-related stuff"

[ Audit-related cleanups, misc simplifications, and easier to follow
  nd->root refcounts     - Linus ]

* 'work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  devpts_pty_kill(): don't bother with d_delete()
  infiniband: don't bother with d_delete()
  hypfs: don't bother with d_delete()
  fs/namei.c: keep track of nd->root refcount status
  fs/namei.c: new helper - legitimize_root()
  kill the last users of user_{path,lpath,path_dir}()
  namei.h: get the comments on LOOKUP_... in sync with reality
  kill LOOKUP_NO_EVAL, don't bother including namei.h from audit.h
  audit_inode(): switch to passing AUDIT_INODE_...
  filename_mountpoint(): make LOOKUP_NO_EVAL unconditional there
  filename_lookup(): audit_inode() argument is always 0
parents 81160dda 46c46f8d

arch/s390/hypfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void hypfs_remove(struct dentry *dentry) 
		else

			simple_unlink(d_inode(parent), dentry);

	}

	d_delete(dentry);

	d_drop(dentry);

	dput(dentry);

	inode_unlock(d_inode(parent));

}

drivers/infiniband/hw/qib/qib_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int remove_device_files(struct super_block *sb, 
	remove_file(dir, "flash");

	inode_unlock(d_inode(dir));

	ret = simple_rmdir(d_inode(root), dir);

	d_delete(dir);

	d_drop(dir);

	dput(dir);



bail:

fs/coda/pioctl.c

+2 −5
Original line number Diff line number Diff line
@@ -63,11 +63,8 @@ static long coda_pioctl(struct file *filp, unsigned int cmd, 
	 * Look up the pathname. Note that the pathname is in

	 * user memory, and namei takes care of this

	 */

	if (data.follow)

		error = user_path(data.path, &path);

	else

		error = user_lpath(data.path, &path);



	error = user_path_at(AT_FDCWD, data.path,

			     data.follow ? LOOKUP_FOLLOW : 0, &path);

	if (error)

		return error;

fs/devpts/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ void devpts_pty_kill(struct dentry *dentry) 
	dentry->d_fsdata = NULL;

	drop_nlink(dentry->d_inode);

	fsnotify_unlink(d_inode(dentry->d_parent), dentry);

	d_delete(dentry);

	d_drop(dentry);

	dput(dentry);	/* d_alloc_name() in devpts_pty_new() */

}

fs/namei.c

+28 −36
Original line number Diff line number Diff line
@@ -596,14 +596,12 @@ static void terminate_walk(struct nameidata *nd) 
		path_put(&nd->path);

		for (i = 0; i < nd->depth; i++)

			path_put(&nd->stack[i].link);

		if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) {

		if (nd->flags & LOOKUP_ROOT_GRABBED) {

			path_put(&nd->root);

			nd->root.mnt = NULL;

			nd->flags &= ~LOOKUP_ROOT_GRABBED;

		}

	} else {

		nd->flags &= ~LOOKUP_RCU;

		if (!(nd->flags & LOOKUP_ROOT))

			nd->root.mnt = NULL;

		rcu_read_unlock();

	}

	nd->depth = 0;
@@ -641,6 +639,14 @@ static bool legitimize_links(struct nameidata *nd) 
	return true;

}



static bool legitimize_root(struct nameidata *nd)

{

	if (!nd->root.mnt || (nd->flags & LOOKUP_ROOT))

		return true;

	nd->flags |= LOOKUP_ROOT_GRABBED;

	return legitimize_path(nd, &nd->root, nd->root_seq);

}



/*

 * Path walking has 2 modes, rcu-walk and ref-walk (see

 * Documentation/filesystems/path-lookup.txt).  In situations when we can't
@@ -671,23 +677,18 @@ static int unlazy_walk(struct nameidata *nd) 


	nd->flags &= ~LOOKUP_RCU;

	if (unlikely(!legitimize_links(nd)))

		goto out2;

	if (unlikely(!legitimize_path(nd, &nd->path, nd->seq)))

		goto out1;

	if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) {

		if (unlikely(!legitimize_path(nd, &nd->root, nd->root_seq)))

	if (unlikely(!legitimize_path(nd, &nd->path, nd->seq)))

		goto out;

	if (unlikely(!legitimize_root(nd)))

		goto out;

	}

	rcu_read_unlock();

	BUG_ON(nd->inode != parent->d_inode);

	return 0;



out2:

out1:

	nd->path.mnt = NULL;

	nd->path.dentry = NULL;

out1:

	if (!(nd->flags & LOOKUP_ROOT))

		nd->root.mnt = NULL;

out:

	rcu_read_unlock();

	return -ECHILD;
@@ -727,23 +728,14 @@ static int unlazy_child(struct nameidata *nd, struct dentry *dentry, unsigned se 
	 */

	if (unlikely(!lockref_get_not_dead(&dentry->d_lockref)))

		goto out;

	if (unlikely(read_seqcount_retry(&dentry->d_seq, seq))) {

		rcu_read_unlock();

		dput(dentry);

		goto drop_root_mnt;

	}

	if (unlikely(read_seqcount_retry(&dentry->d_seq, seq)))

		goto out_dput;

	/*

	 * Sequence counts matched. Now make sure that the root is

	 * still valid and get it if required.

	 */

	if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) {

		if (unlikely(!legitimize_path(nd, &nd->root, nd->root_seq))) {

			rcu_read_unlock();

			dput(dentry);

			return -ECHILD;

		}

	}



	if (unlikely(!legitimize_root(nd)))

		goto out_dput;

	rcu_read_unlock();

	return 0;
@@ -753,9 +745,10 @@ out1: 
	nd->path.dentry = NULL;

out:

	rcu_read_unlock();

drop_root_mnt:

	if (!(nd->flags & LOOKUP_ROOT))

		nd->root.mnt = NULL;

	return -ECHILD;

out_dput:

	rcu_read_unlock();

	dput(dentry);

	return -ECHILD;

}
@@ -819,6 +812,7 @@ static void set_root(struct nameidata *nd) 
		} while (read_seqcount_retry(&fs->seq, seq));

	} else {

		get_fs_root(fs, &nd->root);

		nd->flags |= LOOKUP_ROOT_GRABBED;

	}

}
@@ -1735,8 +1729,6 @@ static int pick_link(struct nameidata *nd, struct path *link, 
				nd->flags &= ~LOOKUP_RCU;

				nd->path.mnt = NULL;

				nd->path.dentry = NULL;

				if (!(nd->flags & LOOKUP_ROOT))

					nd->root.mnt = NULL;

				rcu_read_unlock();

			} else if (likely(unlazy_walk(nd)) == 0)

				error = nd_alloc_stack(nd);
@@ -2350,7 +2342,7 @@ int filename_lookup(int dfd, struct filename *name, unsigned flags, 
		retval = path_lookupat(&nd, flags | LOOKUP_REVAL, path);



	if (likely(!retval))

		audit_inode(name, path->dentry, flags & LOOKUP_PARENT);

		audit_inode(name, path->dentry, 0);

	restore_nameidata();

	putname(name);

	return retval;
@@ -2391,7 +2383,7 @@ static struct filename *filename_parentat(int dfd, struct filename *name, 
	if (likely(!retval)) {

		*last = nd.last;

		*type = nd.last_type;

		audit_inode(name, parent->dentry, LOOKUP_PARENT);

		audit_inode(name, parent->dentry, AUDIT_INODE_PARENT);

	} else {

		putname(name);

		name = ERR_PTR(retval);
@@ -2718,7 +2710,7 @@ filename_mountpoint(int dfd, struct filename *name, struct path *path, 
	if (unlikely(error == -ESTALE))

		error = path_mountpoint(&nd, flags | LOOKUP_REVAL, path);

	if (likely(!error))

		audit_inode(name, path->dentry, flags & LOOKUP_NO_EVAL);

		audit_inode(name, path->dentry, AUDIT_INODE_NOEVAL);

	restore_nameidata();

	putname(name);

	return error;
@@ -3299,7 +3291,7 @@ static int do_last(struct nameidata *nd, 
		if (error)

			return error;



		audit_inode(nd->name, dir, LOOKUP_PARENT);

		audit_inode(nd->name, dir, AUDIT_INODE_PARENT);

		/* trailing slashes? */

		if (unlikely(nd->last.name[nd->last.len]))

			return -EISDIR;

CRA Git | Maintained and supported by SUSTech CRA and CCSE