Commit 58ec9059 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 name lookup updates from Al Viro:
 "Small namei.c patch series, mostly to simplify the rules for nameidata
  state. It's actually from the previous cycle - but I didn't post it
  for review in time...

  Changes visible outside of fs/namei.c: file_open_root() calling
  conventions change, some freed bits in LOOKUP_... space"

* 'work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  namei: make sure nd->depth is always valid
  teach set_nameidata() to handle setting the root as well
  take LOOKUP_{ROOT,ROOT_GRABBED,JUMPED} out of LOOKUP_... space
  switch file_open_root() to struct path
parents d3acb15a 7962c7d1

Documentation/filesystems/path-lookup.rst

+3 −3
Original line number Diff line number Diff line
@@ -1297,18 +1297,18 @@ to lookup: RCU-walk, REF-walk, and REF-walk with forced revalidation. 
yet.  This is primarily used to tell the audit subsystem the full

context of a particular access being audited.



``LOOKUP_ROOT`` indicates that the ``root`` field in the ``nameidata`` was

``ND_ROOT_PRESET`` indicates that the ``root`` field in the ``nameidata`` was

provided by the caller, so it shouldn't be released when it is no

longer needed.



``LOOKUP_JUMPED`` means that the current dentry was chosen not because

``ND_JUMPED`` means that the current dentry was chosen not because

it had the right name but for some other reason.  This happens when

following "``..``", following a symlink to ``/``, crossing a mount point

or accessing a "``/proc/$PID/fd/$FD``" symlink (also known as a "magic

link"). In this case the filesystem has not been asked to revalidate the

name (with ``d_revalidate()``).  In such cases the inode may still need

to be revalidated, so ``d_op->d_weak_revalidate()`` is called if

``LOOKUP_JUMPED`` is set when the look completes - which may be at the

``ND_JUMPED`` is set when the look completes - which may be at the

final component or, when creating, unlinking, or renaming, at the penultimate component.



Resolution-restriction flags

Documentation/filesystems/porting.rst

+9 −0
Original line number Diff line number Diff line
@@ -899,3 +899,12 @@ iov_iter_copy_from_user_atomic() is gone; use copy_page_from_iter_atomic(). 
The difference is copy_page_from_iter_atomic() advances the iterator and

you don't need iov_iter_advance() after it.  However, if you decide to use

only a part of obtained data, you should do iov_iter_revert().



---



**mandatory**



Calling conventions for file_open_root() changed; now it takes struct path *

instead of passing mount and dentry separately.  For callers that used to

pass <mnt, mnt->mnt_root> pair (i.e. the root of given mount), a new helper

is provided - file_open_root_mnt().  In-tree users adjusted.

arch/um/drivers/mconsole_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ void mconsole_proc(struct mc_request *req) 
		mconsole_reply(req, "Proc not available", 1, 0);

		goto out;

	}

	file = file_open_root(mnt->mnt_root, mnt, ptr, O_RDONLY, 0);

	file = file_open_root_mnt(mnt, ptr, O_RDONLY, 0);

	if (IS_ERR(file)) {

		mconsole_reply(req, "Failed to open file", 1, 0);

		printk(KERN_ERR "open /proc/%s: %ld\n", ptr, PTR_ERR(file));

fs/coredump.c

+2 −2
Original line number Diff line number Diff line
@@ -755,8 +755,8 @@ void do_coredump(const kernel_siginfo_t *siginfo) 
			task_lock(&init_task);

			get_fs_root(init_task.fs, &root);

			task_unlock(&init_task);

			cprm.file = file_open_root(root.dentry, root.mnt,

				cn.corename, open_flags, 0600);

			cprm.file = file_open_root(&root, cn.corename,

						   open_flags, 0600);

			path_put(&root);

		} else {

			cprm.file = filp_open(cn.corename, open_flags, 0600);

fs/fhandle.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static long do_handle_open(int mountdirfd, struct file_handle __user *ufh, 
		path_put(&path);

		return fd;

	}

	file = file_open_root(path.dentry, path.mnt, "", open_flag, 0);

	file = file_open_root(&path, "", open_flag, 0);

	if (IS_ERR(file)) {

		put_unused_fd(fd);

		retval =  PTR_ERR(file);