stuff from the last cycle that missed the window
Subsystems (5)
Al Viro
maintainerPATCH 1/1 stuff from the last cycle that missed the window
Several patches had been sitting in -next since January or so, missed the last window. Just noticed that this stuff had never been posted to fsdevel, so...
Al Viro
maintainerPATCH 1/1 fs/namei.c:reserve_stack(): tidy up the call of try_to_unlazy()
!foo() != 0 is a strange way to spell !foo(); fallout from "fs: make unlazy_walk() error handling consistent"...
--- fs/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/namei.c +1 -1
@@ -1754,7 +1754,7 @@ static int reserve_stack(struct nameidata *nd, struct path *link, unsigned seq)// unlazy even if we fail to grab the link - cleanup needs it bool grabbed_link =legitimize_path (nd, link, seq); -if (!try_to_unlazy (nd) !=0 || !grabbed_link) +if (!try_to_unlazy (nd) || !grabbed_link)return -ECHILD ;if (nd_alloc_stack (nd))
Signature · 1 line
2.30.2
Re: [PATCH] fs/namei.c:reserve_stack(): tidy up the call of try_to_unlazy()
Quoted 5 lines · Al Viro
!foo() != 0 is a strange way to spell !foo(); fallout from "fs: make
unlazy_walk()error handling consistent"...Signed-off-by Al Viro <[email protected]>---
Looks good to me,
Al Viro
maintainerPATCH 1/1 get rid of dead code in legitimize_root()
In reply to Al ViroCombination of LOOKUP_IS_SCOPED and NULL nd->root.mnt is impossible after successful path_init(). All places where ->root.mnt might become NULL do that only if LOOKUP_IS_SCOPED is not there and path_init() itself can return success without setting nd->root only if ND_ROOT_PRESET had been set (in which case nd->root had been set by caller and never changed) or if the name had been a relative one *and* none of the bits in LOOKUP_IS_SCOPED had been present.
Since all calls of legitimize_root() must be downstream of successful path_init(), the check for !nd->root.mnt && (nd->flags & LOOKUP_IS_SCOPED) is pure paranoia.
FWIW, it had been discussed (and agreed upon) with Aleksa back when scoped lookups had been merged; looks like that had fallen through the cracks back then.
--- fs/namei.c | 7 ------- 1 file changed, 7 deletions(-)
fs/namei.c +0 -7
@@ -729,13 +729,6 @@ static bool legitimize_links(struct nameidata *nd)static bool legitimize_root (struct nameidata *nd) { -/* -* For scoped-lookups (where nd->root has been zeroed), we need to -* restart the whole lookup from scratch -- because set_root() is wrong -* for these lookups (nd->dfd is the root, not the filesystem root). -*/ -if (!nd->root.mnt && (nd->flags &LOOKUP_IS_SCOPED )) -return false;/* Nothing to do if nd->root is zero or is managed by the VFS user. */ if (!nd->root.mnt || (nd->state &ND_ROOT_PRESET ))return true;
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 1/1 uninline may_mount() and don't opencode it in fspick(2)/fsopen(2)
It's done once per (mount-related) syscall and there's no point whatsoever making it inline.
--- fs/fsopen.c | 4 ++-- fs/internal.h | 1 + fs/namespace.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
fs/fsopen.c +2 -2
@@ -119,7 +119,7 @@ SYSCALL_DEFINE2(fsopen, const char __user *, _fs_name, unsigned int, flags)const char *fs_name;int ret; -if (!ns_capable (current->nsproxy->mnt_ns->user_ns,CAP_SYS_ADMIN )) +if (!may_mount ())return -EPERM ;if (flags & ~FSOPEN_CLOEXEC )
@@ -162,7 +162,7 @@ SYSCALL_DEFINE3(fspick, int, dfd, const char __user *, path, unsigned int, flagsunsigned int lookup_flags;int ret; -if (!ns_capable (current->nsproxy->mnt_ns->user_ns,CAP_SYS_ADMIN )) +if (!may_mount ())return -EPERM ; if ((flags & ~(FSPICK_CLOEXEC |
fs/internal.h +1 -0
@@ -84,6 +84,7 @@ extern int __mnt_want_write_file(struct file *);extern void __mnt_drop_write_file (struct file *);extern void dissolve_on_fput (struct vfsmount *); +extern bool may_mount (void );int path_mount (const char *dev_name,struct path *path,const char *type_page,unsigned long flags,void *data_page);
fs/namespace.c +1 -1
@@ -1717,7 +1717,7 @@ void __detach_mounts(struct dentry *dentry)/* * Is the caller allowed to modify his namespace? */ -static inline bool may_mount (void ) +bool may_mount (void ) {return ns_capable (current->nsproxy->mnt_ns->user_ns,CAP_SYS_ADMIN ); }
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 1/1 linux/mount.h: trim includes
--- include/linux/mount.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
include/linux/mount.h +5 -12
@@ -11,17 +11,15 @@#define _LINUX_MOUNT_H#include <linux/types.h> -#include <linux/list.h> -#include <linux/nodemask.h> -#include <linux/spinlock.h> -#include <linux/seqlock.h> -#include <linux/atomic.h> +#include <asm/barrier.h> struct super_block ; -struct vfsmount ;struct dentry ; -struct mnt_namespace ; +struct user_namespace ; +struct file_system_type ;struct fs_context ; +struct file ; +struct path ;#define MNT_NOSUID 0x01#define MNT_NODEV 0x02
@@ -81,9 +79,6 @@ static inline struct user_namespace *mnt_user_ns(const struct vfsmount *mnt)return smp_load_acquire (&mnt->mnt_userns); } -struct file ;/* forward dec */ -struct path ; -extern int mnt_want_write (struct vfsmount *mnt);extern int mnt_want_write_file (struct file *file);extern void mnt_drop_write (struct vfsmount *mnt);
@@ -94,12 +89,10 @@ extern struct vfsmount *mnt_clone_internal(const struct path *path);extern bool __mnt_is_readonly (struct vfsmount *mnt);extern bool mnt_may_suid (struct vfsmount *mnt); -struct path ;extern struct vfsmount *clone_private_mount (const struct path *path);extern int __mnt_want_write (struct vfsmount *);extern void __mnt_drop_write (struct vfsmount *); -struct file_system_type ;extern struct vfsmount *fc_mount (struct fs_context *fc);extern struct vfsmount *vfs_create_mount (struct fs_context *fc); extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 1/1 m->mnt_root->d_inode->i_sb is a weird way to spell m->mnt_sb...
--- fs/nfs/nfs4file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/nfs4file.c +2 -2
@@ -326,7 +326,7 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt,char *read_name =NULL ;int len, status =0 ; - server =NFS_SERVER (ss_mnt->mnt_root->d_inode); + server =NFS_SB (ss_mnt->mnt_sb);if (!fattr)return ERR_PTR (-ENOMEM );
@@ -344,7 +344,7 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt, goto out;snprintf (read_name, len,SSC_READ_NAME_BODY , read_name_gen++); - r_ino =nfs_fhget (ss_mnt->mnt_root->d_inode->i_sb, src_fh, fattr); + r_ino =nfs_fhget (ss_mnt->mnt_sb, src_fh, fattr);if (IS_ERR (r_ino)) { res =ERR_CAST (r_ino); goto out_free_name;
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 1/1 blob_to_mnt(): kern_unmount() is needed to undo kern_mount()
plain mntput() won't do.
--- kernel/usermode_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/usermode_driver.c +2 -2
@@ -28,7 +28,7 @@ static struct vfsmount *blob_to_mnt(const void *data, size_t len, const char *na file =file_open_root_mnt (mnt, name,O_CREAT |O_WRONLY ,0700 );if (IS_ERR (file)) { -mntput (mnt); +kern_unmount (mnt);return ERR_CAST (file); }
@@ -38,7 +38,7 @@ static struct vfsmount *blob_to_mnt(const void *data, size_t len, const char *naif (err >=0 ) err = -ENOMEM ;filp_close (file,NULL ); -mntput (mnt); +kern_unmount (mnt);return ERR_PTR (err); }
Signature · 1 line
2.30.2
Al Viro
maintainerPATCH 1/1 move mount-related externs from fs.h to mount.h
--- arch/alpha/kernel/osf_sys.c | 1 + include/linux/fs.h | 11 ----------- include/linux/mount.h | 12 ++++++++++++ security/smack/smackfs.c | 1 + 4 files changed, 14 insertions(+), 11 deletions(-)
arch/alpha/kernel/osf_sys.c +1 -0
@@ -36,6 +36,7 @@#include <linux/types.h> #include <linux/ipc.h> #include <linux/namei.h> +#include <linux/mount.h> #include <linux/uio.h> #include <linux/vfs.h> #include <linux/rcupdate.h>
include/linux/fs.h +0 -11
@@ -2504,22 +2504,11 @@ struct super_block *sget(struct file_system_type *type,extern int register_filesystem (struct file_system_type *);extern int unregister_filesystem (struct file_system_type *); -extern struct vfsmount *kern_mount (struct file_system_type *); -extern void kern_unmount (struct vfsmount *mnt); -extern int may_umount_tree (struct vfsmount *); -extern int may_umount (struct vfsmount *); -extern long do_mount (const char *,const char __user *, -const char *,unsigned long ,void *); -extern struct vfsmount *collect_mounts (const struct path *); -extern void drop_collected_mounts (struct vfsmount *); -extern int iterate_mounts (int (*)(struct vfsmount *,void *),void *, -struct vfsmount *);extern int vfs_statfs (const struct path *,struct kstatfs *);extern int user_statfs (const char __user *,struct kstatfs *);extern int fd_statfs (int ,struct kstatfs *);extern int freeze_super (struct super_block *super);extern int thaw_super (struct super_block *super); -extern bool our_mnt (struct vfsmount *mnt); extern __printf(2, 3) int super_setup_bdi_name(struct super_block *sb, char *fmt, ...); extern int super_setup_bdi(struct super_block *sb);
include/linux/mount.h +12 -0
@@ -108,6 +108,18 @@ extern void mark_mounts_for_expiry(struct list_head *mounts);extern dev_t name_to_dev_t (const char *name);extern bool path_is_mountpoint (const struct path *path); +extern bool our_mnt (struct vfsmount *mnt); + +extern struct vfsmount *kern_mount (struct file_system_type *); +extern void kern_unmount (struct vfsmount *mnt); +extern int may_umount_tree (struct vfsmount *); +extern int may_umount (struct vfsmount *); +extern long do_mount (const char *,const char __user *, +const char *,unsigned long ,void *); +extern struct vfsmount *collect_mounts (const struct path *); +extern void drop_collected_mounts (struct vfsmount *); +extern int iterate_mounts (int (*)(struct vfsmount *,void *),void *, +struct vfsmount *);extern void kern_unmount_array (struct vfsmount *mnt[],unsigned int num);#endif /* _LINUX_MOUNT_H */
security/smack/smackfs.c +1 -0
@@ -23,6 +23,7 @@#include <linux/ctype.h> #include <linux/audit.h> #include <linux/magic.h> +#include <linux/mount.h> #include <linux/fs_context.h> #include "smack.h"
Signature · 1 line
2.30.2
Re: [PATCH] move mount-related externs from fs.h to mount.h
Quoted 2 lines · Al Viro
Signed-off-by Al Viro <[email protected]>---
Looks good to me,
Re: [PATCH] blob_to_mnt(): kern_unmount() is needed to undo kern_mount()
In reply to Al ViroQuoted 3 lines · Al Viro
plain
mntput()won't do.Signed-off-by Al Viro <[email protected]>
It is already performing kern_unmount on the happy path so I don't see how it will be a problem to call kern_unmount on a failure path.
Do you want to merge this through your tree?
Quoted 24 lines
kernel/usermode_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)kernel/usermode_driver.c +2
-2@@ -28,7 +28,7 @@ static struct vfsmount *blob_to_mnt(const void *data, size_t len, const char *na file =file_open_root_mnt (mnt, name,O_CREAT |O_WRONLY ,0700 );if (IS_ERR (file)) { -mntput (mnt); +kern_unmount (mnt);return ERR_CAST (file); }@@ -38,7 +38,7 @@ static struct vfsmount *blob_to_mnt(const void *data, size_t len, const char *naif (err >=0 ) err = -ENOMEM ;filp_close (file,NULL ); -mntput (mnt); +kern_unmount (mnt);return ERR_PTR (err); }
Re: [PATCH] linux/mount.h: trim includes
In reply to Al ViroQuoted 2 lines · Al Viro
Signed-off-by Al Viro <[email protected]>---
Looks good to me,
Re: [PATCH] uninline may_mount() and don't opencode it in fspick(2)/fsopen(2)
In reply to Al ViroQuoted 5 lines · Al Viro
It's done once per (mount-related) syscall and there's no point whatsoever making it inline.
Signed-off-by Al Viro <[email protected]>---
Looks good to me,
Re: [PATCH] get rid of dead code in legitimize_root()
In reply to Al ViroQuoted 13 lines · Al Viro
Combination of
LOOKUP_IS_SCOPEDand NULLnd->root.mntis impossible after successfulpath_init(). All places where ->root.mnt might become NULL do that only ifLOOKUP_IS_SCOPEDis not there andpath_init()itself can return success without settingnd->rootonly ifND_ROOT_PRESEThad been set (in which casend->roothad been set by caller and never changed) or if the name had been a relative one *and* none of the bits inLOOKUP_IS_SCOPEDhad been present.Since all calls of
legitimize_root()must be downstream of successfulpath_init(), the check for !nd->root.mnt && (nd->flags&LOOKUP_IS_SCOPED) is pure paranoia.
Quoted 6 lines
FWIW, it had been discussed (and agreed upon) with Aleksa back when scoped lookups had been merged; looks like that had fallen through the cracks back then.
Signed-off-by Al Viro <[email protected]>---
Looks good to me,