Commit 9c577491 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull vfs pathwalk sanitizing from Al Viro:
 "Massive pathwalk rewrite and cleanups.

  Several iterations have been posted; hopefully this thing is getting
  readable and understandable now. Pretty much all parts of pathname
  resolutions are affected...

  The branch is identical to what has sat in -next, except for commit
  message in "lift all calls of step_into() out of follow_dotdot/
  follow_dotdot_rcu", crediting Qian Cai for reporting the bug; only
  commit message changed there."

* 'work.dotdot1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (69 commits)
  lookup_open(): don't bother with fallbacks to lookup+create
  atomic_open(): no need to pass struct open_flags anymore
  open_last_lookups(): move complete_walk() into do_open()
  open_last_lookups(): lift O_EXCL|O_CREAT handling into do_open()
  open_last_lookups(): don't abuse complete_walk() when all we want is unlazy
  open_last_lookups(): consolidate fsnotify_create() calls
  take post-lookup part of do_last() out of loop
  link_path_walk(): sample parent's i_uid and i_mode for the last component
  __nd_alloc_stack(): make it return bool
  reserve_stack(): switch to __nd_alloc_stack()
  pick_link(): take reserving space on stack into a new helper
  pick_link(): more straightforward handling of allocation failures
  fold path_to_nameidata() into its only remaining caller
  pick_link(): pass it struct path already with normal refcounting rules
  fs/namei.c: kill follow_mount()
  non-RCU analogue of the previous commit
  helper for mount rootwards traversal
  follow_dotdot(): be lazy about changing nd->path
  follow_dotdot_rcu(): be lazy about changing nd->path
  follow_dotdot{,_rcu}(): massage loops
  ...
parents d987ca1c 99a4a90c

Documentation/filesystems/path-lookup.rst

+2 −5
Original line number Diff line number Diff line
@@ -404,11 +404,8 @@ that is the "next" component in the pathname. 
``int last_type``

~~~~~~~~~~~~~~~~~



This is one of ``LAST_NORM``, ``LAST_ROOT``, ``LAST_DOT``, ``LAST_DOTDOT``, or

``LAST_BIND``.  The ``last`` field is only valid if the type is

``LAST_NORM``.  ``LAST_BIND`` is used when following a symlink and no

components of the symlink have been processed yet.  Others should be

fairly self-explanatory.

This is one of ``LAST_NORM``, ``LAST_ROOT``, ``LAST_DOT`` or ``LAST_DOTDOT``.

The ``last`` field is only valid if the type is ``LAST_NORM``.



``struct path root``

~~~~~~~~~~~~~~~~~~~~

fs/autofs/dev-ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static int find_autofs_mount(const char *pathname, 
	struct path path;

	int err;



	err = kern_path_mountpoint(AT_FDCWD, pathname, &path, 0);

	err = kern_path(pathname, LOOKUP_MOUNTPOINT, &path);

	if (err)

		return err;

	err = -ENOENT;
@@ -519,8 +519,8 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp, 


	if (!fp || param->ioctlfd == -1) {

		if (autofs_type_any(type))

			err = kern_path_mountpoint(AT_FDCWD,

						   name, &path, LOOKUP_FOLLOW);

			err = kern_path(name, LOOKUP_FOLLOW | LOOKUP_MOUNTPOINT,

					&path);

		else

			err = find_autofs_mount(name, &path,

						test_by_type, &type);

fs/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ extern int finish_clean_context(struct fs_context *fc); 
 */

extern int filename_lookup(int dfd, struct filename *name, unsigned flags,

			   struct path *path, struct path *root);

extern int user_path_mountpoint_at(int, const char __user *, unsigned int, struct path *);

extern int vfs_path_lookup(struct dentry *, struct vfsmount *,

			   const char *, unsigned int, struct path *);

long do_mknodat(int dfd, const char __user *filename, umode_t mode,