mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
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
This commit is contained in:
commit
53e5e7a7a7
10 changed files with 64 additions and 111 deletions
|
|
@ -1675,8 +1675,6 @@ int ksys_umount(char __user *name, int flags)
|
|||
if (!(flags & UMOUNT_NOFOLLOW))
|
||||
lookup_flags |= LOOKUP_FOLLOW;
|
||||
|
||||
lookup_flags |= LOOKUP_NO_EVAL;
|
||||
|
||||
retval = user_path_mountpoint_at(AT_FDCWD, name, lookup_flags, &path);
|
||||
if (retval)
|
||||
goto out;
|
||||
|
|
@ -3046,7 +3044,7 @@ long do_mount(const char *dev_name, const char __user *dir_name,
|
|||
return -EINVAL;
|
||||
|
||||
/* ... and get the mountpoint */
|
||||
retval = user_path(dir_name, &path);
|
||||
retval = user_path_at(AT_FDCWD, dir_name, LOOKUP_FOLLOW, &path);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
|
|
@ -3593,11 +3591,13 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
|
|||
if (!may_mount())
|
||||
return -EPERM;
|
||||
|
||||
error = user_path_dir(new_root, &new);
|
||||
error = user_path_at(AT_FDCWD, new_root,
|
||||
LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &new);
|
||||
if (error)
|
||||
goto out0;
|
||||
|
||||
error = user_path_dir(put_old, &old);
|
||||
error = user_path_at(AT_FDCWD, put_old,
|
||||
LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &old);
|
||||
if (error)
|
||||
goto out1;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue