add file system helpers that take kernel pointers for the init code v2
Subsystems (4)
Hi Al and Linus,
currently a lot of the file system calls in the early in code (and the devtmpfs kthread) rely on the implicit set_fs(KERNEL_DS) during boot. This is one of the few last remaining places we need to deal with to kill off set_fs entirely, so this series adds new helpers that take kernel pointers. These helpers are in init/ and marked __init and thus will be discarded after bootup. A few also need to be duplicated in devtmpfs, though unfortunately.
The series sits on top of my previous
"decruft the early init / initrd / initramfs code v2"
series.
Git tree:
git://git.infradead.org/users/hch/misc.git init_path
Gitweb:
http://git.infradead.org/users/hch/misc.git/shortlog/refs/heads/init_path
Changes since v1:
- avoid most core VFS changes
- renamed the functions and move them to init/ and devtmpfs
- drop a bunch of cleanups that can be submitted independently now
Diffstat:
PATCH 1/24 fs: refactor do_mount
Factor out a path_mount helper that takes a struct path * instead of the actual file name. This will allow to convert the init and devtmpfs code to properly mount based on a kernel pointer instead of relying on the implicit set_fs(KERNEL_DS) during early init.
--- fs/namespace.c | 67 ++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 32 deletions(-)
fs/namespace.c +35 -32
@@ -3115,12 +3115,11 @@ char *copy_mount_string(const void __user *data)* Therefore, if this magic number is present, it carries no information * and must be discarded. */ -long do_mount (const char *dev_name,const char __user *dir_name, +static int path_mount (const char *dev_name,struct path *path,const char *type_page,unsigned long flags,void *data_page) { -struct path path;unsigned int mnt_flags =0 , sb_flags; -int retval =0 ; +int ret;/* Discard magic */ if ((flags &MS_MGC_MSK ) ==MS_MGC_VAL )
@@ -3133,19 +3132,13 @@ long do_mount(const char *dev_name, const char __user *dir_name,if (flags &MS_NOUSER )return -EINVAL ; -/* ... and get the mountpoint */ - retval =user_path_at (AT_FDCWD , dir_name,LOOKUP_FOLLOW , &path); -if (retval) -return retval; - - retval =security_sb_mount (dev_name, &path, - type_page, flags, data_page); -if (!retval && !may_mount ()) - retval = -EPERM ; -if (!retval && (flags &SB_MANDLOCK ) && !may_mandlock ()) - retval = -EPERM ; -if (retval) - goto dput_out; + ret =security_sb_mount (dev_name, path, type_page, flags, data_page); +if (ret) +return ret; +if (!may_mount ()) +return -EPERM ; +if ((flags &SB_MANDLOCK ) && !may_mandlock ()) +return -EPERM ;/* Default to relatime unless overriden */ if (!(flags &MS_NOATIME ))
@@ -3172,7 +3165,7 @@ long do_mount(const char *dev_name, const char __user *dir_name, ((flags & (MS_NOATIME | MS_NODIRATIME | MS_RELATIME | MS_STRICTATIME)) == 0)) { mnt_flags &= ~MNT_ATIME_MASK ; - mnt_flags |= path.mnt->mnt_flags &MNT_ATIME_MASK ; + mnt_flags |= path->mnt->mnt_flags &MNT_ATIME_MASK ; } sb_flags = flags & (SB_RDONLY |
@@ -3185,22 +3178,32 @@ long do_mount(const char *dev_name, const char __user *dir_name, SB_I_VERSION);if ((flags & (MS_REMOUNT |MS_BIND )) == (MS_REMOUNT |MS_BIND )) - retval =do_reconfigure_mnt (&path, mnt_flags); -else if (flags &MS_REMOUNT ) - retval =do_remount (&path, flags, sb_flags, mnt_flags, - data_page); -else if (flags &MS_BIND ) - retval =do_loopback (&path, dev_name, flags &MS_REC ); -else if (flags & (MS_SHARED |MS_PRIVATE |MS_SLAVE |MS_UNBINDABLE )) - retval =do_change_type (&path, flags); -else if (flags &MS_MOVE ) - retval =do_move_mount_old (&path, dev_name); -else - retval =do_new_mount (&path, type_page, sb_flags, mnt_flags, - dev_name, data_page); -dput_out: +return do_reconfigure_mnt (path, mnt_flags); +if (flags &MS_REMOUNT ) +return do_remount (path, flags, sb_flags, mnt_flags, data_page); +if (flags &MS_BIND ) +return do_loopback (path, dev_name, flags &MS_REC ); +if (flags & (MS_SHARED |MS_PRIVATE |MS_SLAVE |MS_UNBINDABLE )) +return do_change_type (path, flags); +if (flags &MS_MOVE ) +return do_move_mount_old (path, dev_name); + +return do_new_mount (path, type_page, sb_flags, mnt_flags, dev_name, + data_page); +} + +long do_mount (const char *dev_name,const char __user *dir_name, +const char *type_page,unsigned long flags,void *data_page) +{ +struct path path; +int ret; + + ret =user_path_at (AT_FDCWD , dir_name,LOOKUP_FOLLOW , &path); +if (ret) +return ret; + ret =path_mount (dev_name, &path, type_page, flags, data_page);path_put (&path); -return retval; +return ret; }static struct ucounts *inc_mnt_namespaces (struct user_namespace *ns)
Signature · 1 line
2.27.0
PATCH 2/24 fs: refactor ksys_umount
In reply to Christoph HellwigFactor out a path_umount helper that takes a struct path * instead of the actual file name. This will allow to convert the init and devtmpfs code to properly mount based on a kernel pointer instead of relying on the implicit set_fs(KERNEL_DS) during early init.
--- fs/namespace.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-)
fs/namespace.c +18 -22
@@ -1706,36 +1706,19 @@ static inline bool may_mandlock(void) }#endif -/* -* Now umount can handle mount points as well as block devices. -* This is important for filesystems which use unnamed block devices. -* -* We now support a flag for forced unmount like the other 'big iron' -* unixes. Our API is identical to OSF/1 to avoid making a mess of AMD -*/ - -int ksys_umount (char __user *name,int flags) +static int path_umount (struct path *path,int flags) { -struct path path;struct mount *mnt;int retval; -int lookup_flags =LOOKUP_MOUNTPOINT ;if (flags & ~(MNT_FORCE |MNT_DETACH |MNT_EXPIRE |UMOUNT_NOFOLLOW ))return -EINVAL ; -if (!may_mount ())return -EPERM ; -if (!(flags &UMOUNT_NOFOLLOW )) - lookup_flags |=LOOKUP_FOLLOW ; - - retval =user_path_at (AT_FDCWD , name, lookup_flags, &path); -if (retval) - goto out; - mnt =real_mount (path.mnt); + mnt =real_mount (path->mnt); retval = -EINVAL ; -if (path.dentry != path.mnt->mnt_root) +if (path->dentry != path->mnt->mnt_root) goto dput_and_out;if (!check_mnt (mnt)) goto dput_and_out;
@@ -1748,12 +1731,25 @@ int ksys_umount(char __user *name, int flags) retval =do_umount (mnt, flags); dput_and_out:/* we mustn't call path_put() as that would clear mnt_expiry_mark */ -dput (path.dentry); +dput (path->dentry);mntput_no_expire (mnt); -out:return retval; } +int ksys_umount (char __user *name,int flags) +{ +int lookup_flags =LOOKUP_MOUNTPOINT ; +struct path path; +int ret; + +if (!(flags &UMOUNT_NOFOLLOW )) + lookup_flags |=LOOKUP_FOLLOW ; + ret =user_path_at (AT_FDCWD , name, lookup_flags, &path); +if (ret) +return ret; +return path_umount (&path, flags); +} + SYSCALL_DEFINE2(umount, char __user *, name, int, flags) {return ksys_umount (name, flags);
Signature · 1 line
2.27.0
PATCH 3/24 fs: push the getname from do_rmdir into the callers
In reply to Christoph HellwigThis mirrors do_unlinkat and will make life a little easier for the init code to reuse the whole function with a kernel filename.
--- fs/internal.h | 2 +- fs/namei.c | 10 ++++------ include/linux/syscalls.h | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-)
fs/internal.h +1 -1
@@ -65,7 +65,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,long do_mknodat (int dfd,const char __user *filename,umode_t mode,unsigned int dev);long do_mkdirat (int dfd,const char __user *pathname,umode_t mode); -long do_rmdir (int dfd,const char __user *pathname); +long do_rmdir (int dfd,struct filename *name);long do_unlinkat (int dfd,struct filename *name);long do_symlinkat (const char __user *oldname,int newdfd,const char __user *newname);
fs/namei.c +4 -6
@@ -3720,17 +3720,16 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry) }EXPORT_SYMBOL (vfs_rmdir); -long do_rmdir (int dfd,const char __user *pathname) +long do_rmdir (int dfd,struct filename *name) {int error =0 ; -struct filename *name;struct dentry *dentry;struct path path;struct qstr last;int type;unsigned int lookup_flags =0 ; retry: - name =filename_parentat (dfd,getname (pathname), lookup_flags, + name =filename_parentat (dfd, name, lookup_flags, &path, &last, &type);if (IS_ERR (name))return PTR_ERR (name);
@@ -3781,7 +3780,7 @@ long do_rmdir(int dfd, const char __user *pathname) SYSCALL_DEFINE1(rmdir, const char __user *, pathname) { -return do_rmdir (AT_FDCWD , pathname); +return do_rmdir (AT_FDCWD ,getname (pathname)); }/**
@@ -3926,8 +3925,7 @@ SYSCALL_DEFINE3(unlinkat, int, dfd, const char __user *, pathname, int, flag)return -EINVAL ;if (flag &AT_REMOVEDIR ) -return do_rmdir (dfd, pathname); - +return do_rmdir (dfd,getname (pathname));return do_unlinkat (dfd,getname (pathname)); }
include/linux/syscalls.h +2 -2
@@ -1281,11 +1281,11 @@ static inline long ksys_unlink(const char __user *pathname)return do_unlinkat (AT_FDCWD ,getname (pathname)); } -extern long do_rmdir (int dfd,const char __user *pathname); +long do_rmdir (int dfd,struct filename *name);static inline long ksys_rmdir (const char __user *pathname) { -return do_rmdir (AT_FDCWD , pathname); +return do_rmdir (AT_FDCWD ,getname (pathname)); }extern long do_mkdirat (int dfd,const char __user *pathname,umode_t mode);
Signature · 1 line
2.27.0
PATCH 4/24 devtmpfs: open code do_mount
In reply to Christoph HellwigReplace do_umount with an open coded version that takes the proper kernel pointer instead of relying on the implicit set_fs(KERNEL_DS) during early init.
--- drivers/base/devtmpfs.c | 17 +++++++++++++++-- fs/namespace.c | 2 +- include/linux/mount.h | 3 +++ 3 files changed, 19 insertions(+), 3 deletions(-)
drivers/base/devtmpfs.c +15 -2
@@ -345,6 +345,19 @@ static int handle_remove(const char *nodename, struct device *dev)return err; } +static int devtmpfs_do_mount (const char __user *dir_name) +{ +struct path p; +int ret; + + ret =kern_path (dir_name,LOOKUP_FOLLOW , &p); +if (ret) +return ret; + ret =path_mount ("devtmpfs" , &p,"devtmpfs" ,MS_SILENT ,NULL ); +path_put (&p); +return ret; +} +/* * If configured, or requested by the commandline, devtmpfs will be * auto-mounted after the kernel mounted the root filesystem.
@@ -359,7 +372,7 @@ int __init devtmpfs_mount(void)if (!thread)return 0 ; - err =do_mount ("devtmpfs" ,"dev" ,"devtmpfs" ,MS_SILENT ,NULL ); + err =devtmpfs_do_mount ("dev" );if (err)printk (KERN_INFO "devtmpfs: error mounting %i\n" , err);else
@@ -385,7 +398,7 @@ static int devtmpfs_setup(void *p) err =ksys_unshare (CLONE_NEWNS );if (err) goto out; - err =do_mount ("devtmpfs" ,"/" ,"devtmpfs" ,MS_SILENT ,NULL ); + err =devtmpfs_do_mount ("/" );if (err) goto out;ksys_chdir ("/.." );/* will traverse into overmounted root */
fs/namespace.c +1 -1
@@ -3111,7 +3111,7 @@ char *copy_mount_string(const void __user *data)* Therefore, if this magic number is present, it carries no information * and must be discarded. */ -static int path_mount (const char *dev_name,struct path *path, +int path_mount (const char *dev_name,struct path *path,const char *type_page,unsigned long flags,void *data_page) {unsigned int mnt_flags =0 , sb_flags;
include/linux/mount.h +3 -0
@@ -113,4 +113,7 @@ extern bool path_is_mountpoint(const struct path *path);extern void kern_unmount_array (struct vfsmount *mnt[],unsigned int num); +int path_mount (const char *dev_name,struct path *path,const char *type_page, +unsigned long flags,void *data_page); +#endif /* _LINUX_MOUNT_H */
Signature · 1 line
2.27.0
PATCH 5/24 devtmpfs: open code ksys_chdir and ksys_chroot
In reply to Christoph Hellwigdevtmpfs is the only non-early init caller of ksys_chdir and ksys_chroot with kernel pointers. Just open code the two operations which only really need a single path lookup anyway in devtmpfs_setup instead. The open coded verson doesn't need any of the stale dentry revalidation logic from the full blown version as those can't happen on tmpfs and ramfs.
--- drivers/base/devtmpfs.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/base/devtmpfs.c +12 -2
@@ -25,6 +25,7 @@#include <linux/sched.h> #include <linux/slab.h> #include <linux/kthread.h> +#include <linux/fs_struct.h> #include <uapi/linux/mount.h> #include "base.h"
@@ -393,6 +394,7 @@ static int handle(const char *name, umode_t mode, kuid_t uid, kgid_t gid,static int devtmpfs_setup (void *p) { +struct path path;int err; err =ksys_unshare (CLONE_NEWNS );
@@ -401,8 +403,16 @@ static int devtmpfs_setup(void *p) err =devtmpfs_do_mount ("/" );if (err) goto out; -ksys_chdir ("/.." );/* will traverse into overmounted root */ -ksys_chroot ("." ); + +/* traverse into overmounted root and then chroot to it */ +if (!kern_path ("/.." ,LOOKUP_FOLLOW |LOOKUP_DIRECTORY , &path) && + !inode_permission (path.dentry->d_inode,MAY_EXEC |MAY_CHDIR ) && +ns_capable (current_user_ns (),CAP_SYS_CHROOT ) && + !security_path_chroot (&path)) { +set_fs_pwd (current->fs, &path); +set_fs_root (current->fs, &path); + } +path_put (&path); out: *(int *)p = err;complete (&setup_done);
Signature · 1 line
2.27.0
Re: [PATCH 05/24] devtmpfs: open code ksys_chdir and ksys_chroot
drivers/base/devtmpfs.c static int devtmpfs_setup(void *p) · line 415
Quoted 11 lines · Christoph Hellwig
drivers/base/devtmpfs.c +10
-0+ +/* traverse into overmounted root and then chroot to it */ +if (!kern_path ("/.." ,LOOKUP_FOLLOW |LOOKUP_DIRECTORY , &path) && + !inode_permission (path.dentry->d_inode,MAY_EXEC |MAY_CHDIR ) && +ns_capable (current_user_ns (),CAP_SYS_CHROOT ) && + !security_path_chroot (&path)) { +set_fs_pwd (current->fs, &path); +set_fs_root (current->fs, &path); + } +path_put (&path);
This looks wrong.
You're doing "path_put()" even if kern_path() didn't succeed.
As far as I can tell, that will either put some uninitialized garbage and cause an oops, or put something that has already been released by the failure path.
Maybe that doesn't happen in practice in this case, but it's still very very wrong.
Plus you shouldn't have those kinds of insanely complex if-statements in the first place. That was what caused the bug - trying to be clever, instead of writing clear code.
I'm not liking how I'm finding fundamental mistakes in patches that _should_ be trivial conversions with no semantic changes.
Linus
Al Viro
maintainerRe: [PATCH 05/24] devtmpfs: open code ksys_chdir and ksys_chroot
Quoted 13 lines · Linus Torvalds
drivers/base/devtmpfs.c static int devtmpfs_setup(void *p) · line 415
Quoted 11 lines · Christoph Hellwig
drivers/base/devtmpfs.c +10
-0+ +/* traverse into overmounted root and then chroot to it */ +if (!kern_path ("/.." ,LOOKUP_FOLLOW |LOOKUP_DIRECTORY , &path) && + !inode_permission (path.dentry->d_inode,MAY_EXEC |MAY_CHDIR ) && +ns_capable (current_user_ns (),CAP_SYS_CHROOT ) && + !security_path_chroot (&path)) { +set_fs_pwd (current->fs, &path); +set_fs_root (current->fs, &path); + } +path_put (&path);
Quoted 1 line
This looks wrong.
It is wrong. kern_path() leaves *path unmodified in case of error, and that struct path is uninitialized here.
Re: [PATCH 05/24] devtmpfs: open code ksys_chdir and ksys_chroot
Quoted 14 lines · Al Viro
Quoted 13 lines · Linus Torvalds
Quoted 11 lines · Christoph Hellwig
drivers/base/devtmpfs.c +10
-0+ +/* traverse into overmounted root and then chroot to it */ +if (!kern_path ("/.." ,LOOKUP_FOLLOW |LOOKUP_DIRECTORY , &path) && + !inode_permission (path.dentry->d_inode,MAY_EXEC |MAY_CHDIR ) && +ns_capable (current_user_ns (),CAP_SYS_CHROOT ) && + !security_path_chroot (&path)) { +set_fs_pwd (current->fs, &path); +set_fs_root (current->fs, &path); + } +path_put (&path);
Quoted 4 lines
Quoted 1 line
This looks wrong.
It is wrong.
kern_path()leaves *path unmodified in case of error, and that struct path is uninitialized here.
Yep. Only saving grace is that the error just doesn't happen during early init.
PATCH 6/24 md: open code vfs_stat in md_setup_drive
In reply to Christoph HellwigInstead of passing a kernel pointer to vfs_stat by relying on the implicit set_fs(KERNEL_DS) in md_setup_drive, just open code the trivial getattr, and use the opportunity to move a little bit more code from the caller into the new helper.
--- drivers/md/md-autodetect.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
drivers/md/md-autodetect.c +20 -9
@@ -8,6 +8,7 @@#include <linux/raid/detect.h> #include <linux/raid/md_u.h> #include <linux/raid/md_p.h> +#include <linux/namei.h> #include "md.h" /*
@@ -119,6 +120,23 @@ static int __init md_setup(char *str)return 1 ; } +static void __init md_lookup_dev (const char *devname,dev_t *dev) +{ +struct kstat stat; +struct path path; +char filename[64 ]; + +if (strncmp (devname,"/dev/" ,5 ) ==0 ) + devname +=5 ; +snprintf (filename,63 ,"/dev/%s" , devname); + +if (!kern_path (filename,LOOKUP_FOLLOW , &path) && + !vfs_getattr (&path, &stat,STATX_BASIC_STATS ,AT_NO_AUTOMOUNT ) && +S_ISBLK (stat.mode)) + *dev =new_decode_dev (stat.rdev); +path_put (&path); +} +static void __init md_setup_drive (struct md_setup_args *args) {char *devname = args->device_names;
@@ -138,21 +156,14 @@ static void __init md_setup_drive(struct md_setup_args *args) }for (i =0 ; i <MD_SB_DISKS && devname !=NULL ; i++) { -struct kstat stat; -char *p; -char comp_name[64 ];dev_t dev; +char *p; p =strchr (devname,',' );if (p) *p++ =0 ; - dev =name_to_dev_t (devname); -if (strncmp (devname,"/dev/" ,5 ) ==0 ) - devname +=5 ; -snprintf (comp_name,63 ,"/dev/%s" , devname); -if (vfs_stat (comp_name, &stat) ==0 &&S_ISBLK (stat.mode)) - dev =new_decode_dev (stat.rdev); +md_lookup_dev (devname, &dev);if (!dev) {pr_warn ("md: Unknown device name: %s\n" , devname);break ;
Signature · 1 line
2.27.0
Al Viro
maintainerRe: [PATCH 06/24] md: open code vfs_stat in md_setup_drive
Quoted 4 lines · Christoph Hellwig
Instead of passing a kernel pointer to
vfs_statby relying on the implicitset_fs(KERNEL_DS)inmd_setup_drive, just open code the trivial getattr, and use the opportunity to move a little bit more code from the caller into the new helper.
Ugh...
Quoted 6 lines
drivers/md/md-autodetect.c +6
-0+static void __init md_lookup_dev (const char *devname,dev_t *dev) +{ +struct kstat stat; +struct path path; +char filename[64 ]; +
drivers/md/md-autodetect.c static int __init md_setup(char *str) · line 138
Quoted 10 lines
drivers/md/md-autodetect.c +10
-0+if (strncmp (devname,"/dev/" ,5 ) ==0 ) + devname +=5 ; +snprintf (filename,63 ,"/dev/%s" , devname); + +if (!kern_path (filename,LOOKUP_FOLLOW , &path) && + !vfs_getattr (&path, &stat,STATX_BASIC_STATS ,AT_NO_AUTOMOUNT ) && +S_ISBLK (stat.mode)) + *dev =new_decode_dev (stat.rdev); +path_put (&path); +}
How about fs/for_init.c and putting the damn helpers there? With calling conventions as close to syscalls as possible, and a fat comment regarding their intended use being _ONLY_ the setup in should-have-been-done-in-userland parts of init?
I really want to keep the surface as small as possible - we had fun shite several releases ago when somebody tried that kind of crap (with open(), IIRC). Let's not go there again...
Re: [PATCH 06/24] md: open code vfs_stat in md_setup_drive
Quoted 4 lines · Al Viro
How about
fs/for_init.cand putting the damn helpers there? With calling conventions as close to syscalls as possible, and a fat comment regarding their intended use being _ONLY_ the setup in should-have-been-done-in-userland parts of init?
Where do you want the prototypes to go? Also do you want devtmpfs use the same helpers, which then't can't be marked __init (mount, chdir, chroot), or separate copies?
Al Viro
maintainerRe: [PATCH 06/24] md: open code vfs_stat in md_setup_drive
Quoted 9 lines · Christoph Hellwig
Quoted 4 lines · Al Viro
How about
fs/for_init.cand putting the damn helpers there? With calling conventions as close to syscalls as possible, and a fat comment regarding their intended use being _ONLY_ the setup in should-have-been-done-in-userland parts of init?Where do you want the prototypes to go? Also do you want devtmpfs use the same helpers, which then't can't be marked
__init(mount, chdir, chroot), or separate copies?
Hmm... mount still can be __init (devtmpfs_mount() is), and I suspect devtmpfs_setup() could also be made such - just turn devtmpfsd() into
static int __init devtmpfsd(void *p)
{
int err = devtmpfs_setup(p);
if (!err)
devtmpfsd_real(); /* never returns */
return err;
}and you are done. As for the prototypes... include/linux/init_syscalls.h, perhaps?
Re: [PATCH 06/24] md: open code vfs_stat in md_setup_drive
Quoted 15 lines · Al Viro
Quoted 9 lines · Christoph Hellwig
Quoted 4 lines · Al Viro
How about
fs/for_init.cand putting the damn helpers there? With calling conventions as close to syscalls as possible, and a fat comment regarding their intended use being _ONLY_ the setup in should-have-been-done-in-userland parts of init?Where do you want the prototypes to go? Also do you want devtmpfs use the same helpers, which then't can't be marked
__init(mount, chdir, chroot), or separate copies?Hmm... mount still can be
__init(devtmpfs_mount()is), and I suspectdevtmpfs_setup()could also be made such - just turndevtmpfsd()into
static int__initdevtmpfsd(void *p)
Quoted 8 lines
{ int err = devtmpfs_setup(p); if (!err) devtmpfsd_real(); /* never returns */ return err; }and you are done.
Yes, that seems to work. We can obviously call non-__init functions from __init ones, and kthread_run doesn't seem to care if it gets passed a __init function.
Here is what I have now:
http://git.infradead.org/users/hch/misc.git/shortlog/refs/heads/init_path
PATCH 7/24 init: initialize ramdisk_execute_command at compile time
In reply to Christoph HellwigSet ramdisk_execute_command to "/init" at compile time. The command line can still override it, but this saves a few instructions and removes a NULL check.
--- init/main.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
init/main.c +1 -5
@@ -154,7 +154,7 @@ static bool initargs_found;#endif static char *execute_command; -static char *ramdisk_execute_command; +static char *ramdisk_execute_command ="/init" ;/* * Used to generate warnings if static_key manipulation functions are used
@@ -1514,10 +1514,6 @@ static noinline void __init kernel_init_freeable(void)* check if there is an early userspace init. If yes, let it do all * the work */ - -if (!ramdisk_execute_command) - ramdisk_execute_command ="/init" ; -if (ksys_access ((const char __user *) ramdisk_execute_command,0 ) !=0 ) { ramdisk_execute_command =NULL ;
Signature · 1 line
2.27.0
PATCH 8/24 init: move the prepare_namespace prototype to init/do_mounts.h
In reply to Christoph HellwigNo need to have this prototype in a global header included by every driver.
--- include/linux/init.h | 1 - init/do_mounts.h | 1 + init/main.c | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-)
include/linux/init.h +0 -1
@@ -147,7 +147,6 @@ extern unsigned int reset_devices;/* used by init/main.c */ void setup_arch (char **); -void prepare_namespace (void );void __init init_rootfs (void );extern struct file_system_type rootfs_fs_type;
init/do_mounts.h +1 -0
@@ -11,6 +11,7 @@void mount_block_root (char *name,int flags);void mount_root (void ); +void prepare_namespace (void );extern int root_mountflags;static inline int create_dev (char *name,dev_t dev)
init/main.c +2 -0
@@ -103,6 +103,8 @@#include <asm/sections.h> #include <asm/cacheflush.h> +#include "do_mounts.h" +#define CREATE_TRACE_POINTS #include <trace/events/initcall.h>
Signature · 1 line
2.27.0
PATCH 9/24 init: mark create_dev as __init
In reply to Christoph HellwigThe helper is only used for the early init code.
--- init/do_mounts.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
init/do_mounts.h +1 -1
@@ -14,7 +14,7 @@ void mount_root(void);void prepare_namespace (void );extern int root_mountflags; -static inline int create_dev (char *name,dev_t dev) +static inline __init int create_dev (char *name,dev_t dev) {ksys_unlink (name);return ksys_mknod (name,S_IFBLK |0600 ,new_encode_dev (dev));
Signature · 1 line
2.27.0
PATCH 10/24 init: open code ksys_umount in handle_initrd
In reply to Christoph HellwigReplace ksys_umount with an open coded version that takes the proper kernel pointer instead of relying on the implicit set_fs(KERNEL_DS) during early init.
--- fs/namespace.c | 4 ++-- include/linux/mount.h | 1 + include/linux/syscalls.h | 1 - init/do_mounts_initrd.c | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-)
fs/namespace.c +2 -2
@@ -1706,7 +1706,7 @@ static inline bool may_mandlock(void) }#endif -static int path_umount (struct path *path,int flags) +int path_umount (struct path *path,int flags) {struct mount *mnt;int retval;
@@ -1736,7 +1736,7 @@ static int path_umount(struct path *path, int flags)return retval; } -int ksys_umount (char __user *name,int flags) +static int ksys_umount (char __user *name,int flags) {int lookup_flags =LOOKUP_MOUNTPOINT ;struct path path;
include/linux/mount.h +1 -0
@@ -115,5 +115,6 @@ extern void kern_unmount_array(struct vfsmount *mnt[], unsigned int num);int path_mount (const char *dev_name,struct path *path,const char *type_page,unsigned long flags,void *data_page); +int path_umount (struct path *path,int flags);#endif /* _LINUX_MOUNT_H */
include/linux/syscalls.h +0 -1
@@ -1236,7 +1236,6 @@ asmlinkage long sys_ni_syscall(void);* the ksys_xyzyyz() functions prototyped below. */ -int ksys_umount (char __user *name,int flags);int ksys_chroot (const char __user *filename);ssize_t ksys_write (unsigned int fd,const char __user *buf,size_t count);int ksys_chdir (const char __user *filename);
init/do_mounts_initrd.c +5 -1
@@ -9,6 +9,7 @@#include <linux/freezer.h> #include <linux/kmod.h> #include <uapi/linux/mount.h> +#include <linux/namei.h> #include "do_mounts.h"
@@ -117,12 +118,15 @@ static void __init handle_initrd(void)if (!error)printk ("okay\n" );else { +struct path path; +if (error == -ENOENT )printk ("/initrd does not exist. Ignored.\n" );else printk ("failed\n" );printk (KERN_NOTICE "Unmounting old root\n" ); -ksys_umount ("/old" ,MNT_DETACH ); +if (!kern_path ("/old" ,LOOKUP_MOUNTPOINT , &path)) +path_umount (&path,MNT_DETACH ); } }
Signature · 1 line
2.27.0
PATCH 11/24 init: open code do_utimes in do_utime
In reply to Christoph HellwigOpen code the trivial utimes case in a version that takes proper kernel pointers.
--- init/initramfs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
init/initramfs.c +8 -1
@@ -104,13 +104,20 @@ static void __init free_hash(void)static long __init do_utime (char *filename,time64_t mtime) {struct timespec64 t[2 ]; +struct path path; +int error; t[0 ].tv_sec = mtime; t[0 ].tv_nsec =0 ; t[1 ].tv_sec = mtime; t[1 ].tv_nsec =0 ; -return do_utimes (AT_FDCWD , filename, t,AT_SYMLINK_NOFOLLOW ); + error =kern_path (filename,0 , &path); +if (error) +return error; + error =vfs_utimes (&path, t); +path_put (&path); +return error; }static __initdata LIST_HEAD (dir_list);
Signature · 1 line
2.27.0
PATCH 12/24 init: add an init_mount helper
In reply to Christoph HellwigLike do_mount, but takes a kernel pointer for the destination path. Switch over the mounts in the init code and devtmpfs to it, which just happen to work due to the implicit set_fs(KERNEL_DS) during early init right now.
--- init/Makefile | 2 +- init/do_mounts.c | 8 ++++---- init/do_mounts.h | 3 +++ init/do_mounts_initrd.c | 6 +++--- init/fs.c | 20 ++++++++++++++++++++ 5 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 init/fs.c
init/Makefile +1 -1
@@ -5,7 +5,7 @@ ccflags-y := -fno-function-sections -fno-data-sections -obj-y := main.o version.o mounts.o +obj-y := main.o version.o fs.o mounts.o ifneq ($(CONFIG_BLK_DEV_INITRD),y) obj-y += noinitramfs.o else
init/do_mounts.c +4 -4
@@ -395,16 +395,16 @@ static int __init do_mount_root(const char *name, const char *fs,int ret;if (data) { -/* do_mount() requires a full page as fifth argument */ +/* init_mount() requires a full page as fifth argument */ p =alloc_page (GFP_KERNEL );if (!p)return -ENOMEM ; data_page =page_address (p); -/* zero-pad. do_mount() will make sure it's terminated */ +/* zero-pad. init_mount() will make sure it's terminated */ strncpy (data_page, data,PAGE_SIZE ); } - ret =do_mount (name,"/root" , fs, flags, data_page); + ret =init_mount (name,"/root" , fs, flags, data_page);if (ret) goto out;
@@ -628,7 +628,7 @@ void __init prepare_namespace(void)mount_root (); out:devtmpfs_mount (); -do_mount ("." ,"/" ,NULL ,MS_MOVE ,NULL ); +init_mount ("." ,"/" ,NULL ,MS_MOVE ,NULL );ksys_chroot ("." ); }
init/do_mounts.h +3 -0
@@ -9,6 +9,9 @@#include <linux/major.h> #include <linux/root_dev.h> +int __init init_mount (const char *dev_name,const char *dir_name, +const char *type_page,unsigned long flags,void *data_page); +void mount_block_root (char *name,int flags);void mount_root (void );void prepare_namespace (void );
init/do_mounts_initrd.c +3 -3
@@ -63,7 +63,7 @@ static int __init init_linuxrc(struct subprocess_info *info, struct cred *new)console_on_rootfs ();/* move initrd over / and chdir/chroot in initrd root */ ksys_chdir ("/root" ); -do_mount ("." ,"/" ,NULL ,MS_MOVE ,NULL ); +init_mount ("." ,"/" ,NULL ,MS_MOVE ,NULL );ksys_chroot ("." );ksys_setsid ();return 0 ;
@@ -100,7 +100,7 @@ static void __init handle_initrd(void) current->flags &= ~PF_FREEZER_SKIP ;/* move initrd to rootfs' /old */ -do_mount (".." ,"." ,NULL ,MS_MOVE ,NULL ); +init_mount (".." ,"." ,NULL ,MS_MOVE ,NULL );/* switch root and cwd back to / of rootfs */ ksys_chroot (".." );
@@ -114,7 +114,7 @@ static void __init handle_initrd(void)mount_root ();printk (KERN_NOTICE "Trying to move old root to /initrd ... " ); - error =do_mount ("/old" ,"/root/initrd" ,NULL ,MS_MOVE ,NULL ); + error =init_mount ("/old" ,"/root/initrd" ,NULL ,MS_MOVE ,NULL );if (!error)printk ("okay\n" );else {
init/fs.c new file +20 -0
@@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/init.h> +#include <linux/mount.h> +#include <linux/namei.h> +#include <linux/fs.h> +#include "do_mounts.h" + +int __init init_mount (const char *dev_name,const char *dir_name, +const char *type_page,unsigned long flags,void *data_page) +{ +struct path path; +int ret; + + ret =kern_path (dir_name,LOOKUP_FOLLOW , &path); +if (ret) +return ret; + ret =path_mount (dev_name, &path, type_page, flags, data_page); +path_put (&path); +return ret; +}
Signature · 1 line
2.27.0
Al Viro
maintainerRe: [PATCH 12/24] init: add an init_mount helper
Quoted 6 lines · Christoph Hellwig
Like
do_mount, but takes a kernel pointer for the destination path. Switch over the mounts in the init code and devtmpfs to it, which just happen to work due to the implicitset_fs(KERNEL_DS)during early init right now.init/fs.c | 20 ++++++++++++++++++++
fs/for_init.c, please.
PATCH 13/24 init: add an init_unlink helper
In reply to Christoph HellwigAdd a simple helper to unlink with a kernel space file name and switch the early init code over to it. Remove the now unused ksys_unlink.
--- include/linux/syscalls.h | 7 ------- init/do_mounts.h | 3 ++- init/do_mounts_initrd.c | 4 ++-- init/do_mounts_rd.c | 2 +- init/fs.c | 6 ++++++ init/initramfs.c | 3 ++- 6 files changed, 13 insertions(+), 12 deletions(-)
include/linux/syscalls.h +0 -7
@@ -1273,13 +1273,6 @@ int compat_ksys_ipc(u32 call, int first, int second,* The following kernel syscall equivalents are just wrappers to fs-internal * functions. Therefore, provide stubs to be inlined at the callsites. */ -extern long do_unlinkat (int dfd,struct filename *name); - -static inline long ksys_unlink (const char __user *pathname) -{ -return do_unlinkat (AT_FDCWD ,getname (pathname)); -} -long do_rmdir (int dfd,struct filename *name);static inline long ksys_rmdir (const char __user *pathname)
init/do_mounts.h +2 -1
@@ -11,6 +11,7 @@int __init init_mount (const char *dev_name,const char *dir_name,const char *type_page,unsigned long flags,void *data_page); +int __init init_unlink (const char *pathname);void mount_block_root (char *name,int flags);void mount_root (void );
@@ -19,7 +20,7 @@ extern int root_mountflags;static inline __init int create_dev (char *name,dev_t dev) { -ksys_unlink (name); +init_unlink (name);return ksys_mknod (name,S_IFBLK |0600 ,new_encode_dev (dev)); }
init/do_mounts_initrd.c +2 -2
@@ -141,11 +141,11 @@ bool __init initrd_load(void)* mounted in the normal path. */ if (rd_load_image ("/initrd.image" ) &&ROOT_DEV != Root_RAM0) { -ksys_unlink ("/initrd.image" ); +init_unlink ("/initrd.image" );handle_initrd ();return true; } } -ksys_unlink ("/initrd.image" ); +init_unlink ("/initrd.image" );return false; }
init/do_mounts_rd.c +1 -1
@@ -271,7 +271,7 @@ int __init rd_load_image(char *from)fput (out_file); out:kfree (buf); -ksys_unlink ("/dev/ram" ); +init_unlink ("/dev/ram" );return res; }
init/fs.c +6 -0
@@ -3,6 +3,7 @@#include <linux/mount.h> #include <linux/namei.h> #include <linux/fs.h> +#include <../fs/internal.h> #include "do_mounts.h" int __init init_mount(const char *dev_name, const char *dir_name,
@@ -18,3 +19,8 @@ int __init init_mount(const char *dev_name, const char *dir_name,path_put (&path);return ret; } + +int __init init_unlink (const char *pathname) +{ +return do_unlinkat (AT_FDCWD ,getname_kernel (pathname)); +}
init/initramfs.c +2 -1
@@ -12,6 +12,7 @@#include <linux/file.h> #include <linux/memblock.h> #include <linux/namei.h> +#include "do_mounts.h" static ssize_t __init xwrite (struct file *file,const char *p,size_t count) {
@@ -307,7 +308,7 @@ static void __init clean_path(char *path, umode_t fmode)if (S_ISDIR (st.mode))ksys_rmdir (path);else -ksys_unlink (path); +init_unlink (path); } }
Signature · 1 line
2.27.0
Al Viro
maintainerRe: [PATCH 13/24] init: add an init_unlink helper
init/fs.c line 6
Quoted 9 lines · Christoph Hellwig
init/fs.c +1
-0@@ -3,6 +3,7 @@#include <linux/mount.h> #include <linux/namei.h> #include <linux/fs.h> +#include <../fs/internal.h>
... and that is why the damn thing would be better off in fs/
PATCH 14/24 init: add an init_rmdir helper
In reply to Christoph HellwigAdd a simple helper to rmdir with a kernel space file name and switch the early init code over to it. Remove the now unused ksys_rmdir.
--- include/linux/syscalls.h | 7 ------- init/do_mounts.h | 1 + init/fs.c | 5 +++++ init/initramfs.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-)
include/linux/syscalls.h +0 -7
@@ -1273,13 +1273,6 @@ int compat_ksys_ipc(u32 call, int first, int second,* The following kernel syscall equivalents are just wrappers to fs-internal * functions. Therefore, provide stubs to be inlined at the callsites. */ -long do_rmdir (int dfd,struct filename *name); - -static inline long ksys_rmdir (const char __user *pathname) -{ -return do_rmdir (AT_FDCWD ,getname (pathname)); -} -extern long do_mkdirat (int dfd,const char __user *pathname,umode_t mode);static inline long ksys_mkdir (const char __user *pathname,umode_t mode)
init/do_mounts.h +1 -0
@@ -12,6 +12,7 @@int __init init_mount (const char *dev_name,const char *dir_name,const char *type_page,unsigned long flags,void *data_page);int __init init_unlink (const char *pathname); +int __init init_rmdir (const char *pathname);void mount_block_root (char *name,int flags);void mount_root (void );
init/fs.c +5 -0
@@ -24,3 +24,8 @@ int __init init_unlink(const char *pathname) {return do_unlinkat (AT_FDCWD ,getname_kernel (pathname)); } + +int __init init_rmdir (const char *pathname) +{ +return do_rmdir (AT_FDCWD ,getname_kernel (pathname)); +}
init/initramfs.c +1 -1
@@ -306,7 +306,7 @@ static void __init clean_path(char *path, umode_t fmode)if (!vfs_lstat (path, &st) && (st.mode ^ fmode) &S_IFMT ) {if (S_ISDIR (st.mode)) -ksys_rmdir (path); +init_rmdir (path);else init_unlink (path); }
Signature · 1 line
2.27.0
PATCH 15/24 init: add an init_chdir helper
In reply to Christoph HellwigAdd a simple helper to chdir with a kernel space file name and switch the early init code over to it. Remove the now unused ksys_chdir.
--- fs/open.c | 7 +------ include/linux/syscalls.h | 1 - init/do_mounts.c | 2 +- init/do_mounts.h | 1 + init/do_mounts_initrd.c | 8 ++++---- init/fs.c | 16 ++++++++++++++++ 6 files changed, 23 insertions(+), 12 deletions(-)
fs/open.c +1 -6
@@ -482,7 +482,7 @@ SYSCALL_DEFINE2(access, const char __user *, filename, int, mode)return do_faccessat (AT_FDCWD , filename, mode,0 ); } -int ksys_chdir (const char __user *filename) +SYSCALL_DEFINE1(chdir, const char __user *, filename) {struct path path;int error;
@@ -508,11 +508,6 @@ int ksys_chdir(const char __user *filename)return error; } -SYSCALL_DEFINE1(chdir, const char __user *, filename) -{ -return ksys_chdir (filename); -} - SYSCALL_DEFINE1(fchdir, unsigned int, fd) {struct fd f =fdget_raw (fd);
include/linux/syscalls.h +0 -1
@@ -1238,7 +1238,6 @@ asmlinkage long sys_ni_syscall(void);int ksys_chroot (const char __user *filename);ssize_t ksys_write (unsigned int fd,const char __user *buf,size_t count); -int ksys_chdir (const char __user *filename);int ksys_fchown (unsigned int fd,uid_t user,gid_t group);ssize_t ksys_read (unsigned int fd,char __user *buf,size_t count);void ksys_sync (void );
init/do_mounts.c +1 -1
@@ -408,7 +408,7 @@ static int __init do_mount_root(const char *name, const char *fs,if (ret) goto out; -ksys_chdir ("/root" ); +init_chdir ("/root" ); s = current->fs->pwd.dentry->d_sb;ROOT_DEV = s->s_dev; printk(KERN_INFO
init/do_mounts.h +1 -0
@@ -11,6 +11,7 @@int __init init_mount (const char *dev_name,const char *dir_name,const char *type_page,unsigned long flags,void *data_page); +int __init init_chdir (const char *filename);int __init init_unlink (const char *pathname);int __init init_rmdir (const char *pathname);
init/do_mounts_initrd.c +4 -4
@@ -62,7 +62,7 @@ static int __init init_linuxrc(struct subprocess_info *info, struct cred *new)ksys_unshare (CLONE_FS |CLONE_FILES );console_on_rootfs ();/* move initrd over / and chdir/chroot in initrd root */ -ksys_chdir ("/root" ); +init_chdir ("/root" );init_mount ("." ,"/" ,NULL ,MS_MOVE ,NULL );ksys_chroot ("." );ksys_setsid ();
@@ -83,7 +83,7 @@ static void __init handle_initrd(void)/* mount initrd on rootfs' /root */ mount_block_root ("/dev/root.old" , root_mountflags & ~MS_RDONLY );ksys_mkdir ("/old" ,0700 ); -ksys_chdir ("/old" ); +init_chdir ("/old" );/* * In case that a resume from disk is carried out by linuxrc or one of
@@ -105,11 +105,11 @@ static void __init handle_initrd(void)ksys_chroot (".." );if (new_decode_dev (real_root_dev) == Root_RAM0) { -ksys_chdir ("/old" ); +init_chdir ("/old" );return ; } -ksys_chdir ("/" ); +init_chdir ("/" );ROOT_DEV =new_decode_dev (real_root_dev);mount_root ();
init/fs.c +16 -0
@@ -3,6 +3,7 @@#include <linux/mount.h> #include <linux/namei.h> #include <linux/fs.h> +#include <linux/fs_struct.h> #include <../fs/internal.h> #include "do_mounts.h"
@@ -20,6 +21,21 @@ int __init init_mount(const char *dev_name, const char *dir_name,return ret; } +int __init init_chdir (const char *filename) +{ +struct path path; +int error; + + error =kern_path (filename,LOOKUP_FOLLOW |LOOKUP_DIRECTORY , &path); +if (error) +return error; + error =inode_permission (path.dentry->d_inode,MAY_EXEC |MAY_CHDIR ); +if (!error) +set_fs_pwd (current->fs, &path); +path_put (&path); +return error; +} +int __init init_unlink (const char *pathname) {return do_unlinkat (AT_FDCWD ,getname_kernel (pathname));
Signature · 1 line
2.27.0
PATCH 16/24 init: add an init_chroot helper
In reply to Christoph HellwigAdd a simple helper to chroot with a kernel space file name and switch the early init code over to it. Remove the now unused ksys_chroot.
--- fs/open.c | 7 +------ include/linux/syscalls.h | 2 -- init/do_mounts.c | 2 +- init/do_mounts.h | 1 + init/do_mounts_initrd.c | 4 ++-- init/fs.c | 23 +++++++++++++++++++++++ 6 files changed, 28 insertions(+), 11 deletions(-)
fs/open.c +1 -6
@@ -530,7 +530,7 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)return error; } -int ksys_chroot (const char __user *filename) +SYSCALL_DEFINE1(chroot, const char __user *, filename) {struct path path;int error;
@@ -563,11 +563,6 @@ int ksys_chroot(const char __user *filename)return error; } -SYSCALL_DEFINE1(chroot, const char __user *, filename) -{ -return ksys_chroot (filename); -} -static int chmod_common (const struct path *path,umode_t mode) {struct inode *inode = path->dentry->d_inode;
include/linux/syscalls.h +0 -2
@@ -1235,8 +1235,6 @@ asmlinkage long sys_ni_syscall(void);* Instead, use one of the functions which work equivalently, such as * the ksys_xyzyyz() functions prototyped below. */ - -int ksys_chroot (const char __user *filename);ssize_t ksys_write (unsigned int fd,const char __user *buf,size_t count);int ksys_fchown (unsigned int fd,uid_t user,gid_t group);ssize_t ksys_read (unsigned int fd,char __user *buf,size_t count);
init/do_mounts.c +1 -1
@@ -629,7 +629,7 @@ void __init prepare_namespace(void) out:devtmpfs_mount ();init_mount ("." ,"/" ,NULL ,MS_MOVE ,NULL ); -ksys_chroot ("." ); +init_chroot ("." ); }static bool is_tmpfs;
init/do_mounts.h +1 -0
@@ -12,6 +12,7 @@int __init init_mount (const char *dev_name,const char *dir_name,const char *type_page,unsigned long flags,void *data_page);int __init init_chdir (const char *filename); +int __init init_chroot (const char *filename);int __init init_unlink (const char *pathname);int __init init_rmdir (const char *pathname);
init/do_mounts_initrd.c +2 -2
@@ -64,7 +64,7 @@ static int __init init_linuxrc(struct subprocess_info *info, struct cred *new)/* move initrd over / and chdir/chroot in initrd root */ init_chdir ("/root" );init_mount ("." ,"/" ,NULL ,MS_MOVE ,NULL ); -ksys_chroot ("." ); +init_chroot ("." );ksys_setsid ();return 0 ; }
@@ -102,7 +102,7 @@ static void __init handle_initrd(void)/* move initrd to rootfs' /old */ init_mount (".." ,"." ,NULL ,MS_MOVE ,NULL );/* switch root and cwd back to / of rootfs */ -ksys_chroot (".." ); +init_chroot (".." );if (new_decode_dev (real_root_dev) == Root_RAM0) {init_chdir ("/old" );
init/fs.c +23 -0
@@ -36,6 +36,29 @@ int __init init_chdir(const char *filename)return error; } +int __init init_chroot (const char *filename) +{ +struct path path; +int error; + + error =kern_path (filename,LOOKUP_FOLLOW |LOOKUP_DIRECTORY , &path); +if (error) +return error; + error =inode_permission (path.dentry->d_inode,MAY_EXEC |MAY_CHDIR ); +if (error) + goto dput_and_out; + error = -EPERM ; +if (!ns_capable (current_user_ns (),CAP_SYS_CHROOT )) + goto dput_and_out; + error =security_path_chroot (&path); +if (error) + goto dput_and_out; +set_fs_root (current->fs, &path); +dput_and_out: +path_put (&path); +return error; +} +int __init init_unlink (const char *pathname) {return do_unlinkat (AT_FDCWD ,getname_kernel (pathname));
Signature · 1 line
2.27.0
Al Viro
maintainerRe: [PATCH 16/24] init: add an init_chroot helper
init/fs.c int __init init_chdir(const char *filename) · line 47
Quoted 9 lines · Christoph Hellwig
init/fs.c +9
-0+int __init init_chroot (const char *filename) +{ +struct path path; +int error; + + error =kern_path (filename,LOOKUP_FOLLOW |LOOKUP_DIRECTORY , &path); +if (error) +return error; + error =inode_permission (path.dentry->d_inode,MAY_EXEC |MAY_CHDIR );
Matter of taste, but if we do that, I wonder if we would be better off with
error = inode_permission(path.dentry->d_inode, MAY_EXEC | MAY_CHDIR); if (!error && !ns_capable(current_user_ns(), CAP_SYS_CHROOT)) error = -EPERM; if (!error) error = security_path_chroot(&path); if (!error) set_fs_root(current->fs, &path); path_put(&path); return error;
kernel test robot
build botRe: [PATCH 16/24] init: add an init_chroot helper
In reply to Christoph HellwigI love your patch! Perhaps something to improve:
Hi Christoph,
I love your patch! Perhaps something to improve:
[auto build test WARNING on next-20200721]
[cannot apply to driver-core/driver-core-testing linux/master song-md/md-next linus/master v5.8-rc6 v5.8-rc5 v5.8-rc4 v5.8-rc7] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Christoph-Hellwig/fs-refactor-do_mount/20200722-012830 base: de2e69cfe54a8f2ed4b75f09d3110c514f45d38e compiler: mips-linux-gcc (GCC) 9.3.0
If you fix the issue, kindly add following tag as appropriate
cppcheck warnings: (new ones prefixed by >>)
>> init/fs.c:53:8: warning: Variable 'error' is reassigned a value before the old one has been used. [redundantAssignment]
error = security_path_chroot(&path);
^
init/fs.c:50:8: note: Variable 'error' is reassigned a value before the old one has been used.
error = -EPERM;
^
init/fs.c:53:8: note: Variable 'error' is reassigned a value before the old one has been used.
error = security_path_chroot(&path);
^
--
>> init/initramfs.c:109:6: warning: Local variable error shadows outer function [shadowFunction]
int error;
^
init/initramfs.c:41:20: note: Shadowed declaration
static void __init error(char *x)
^
init/initramfs.c:109:6: note: Shadow variable
int error;
^vim +/error +53 init/fs.c
38
39 int __init init_chroot(const char *filename)
40 {
41 struct path path;
42 int error;
43
44 error = kern_path(filename, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &path);
45 if (error)
46 return error;
47 error = inode_permission(path.dentry->d_inode, MAY_EXEC | MAY_CHDIR);
48 if (error)
49 goto dput_and_out;
50 error = -EPERM;
51 if (!ns_capable(current_user_ns(), CAP_SYS_CHROOT))
52 goto dput_and_out;
> 53 error = security_path_chroot(&path);
54 if (error)
55 goto dput_and_out;
56 set_fs_root(current->fs, &path);
57 dput_and_out:
58 path_put(&path);
59 return error;
60 }
61 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH 17/24 init: add an init_chown helper
In reply to Christoph HellwigAdd a simple helper to chown with a kernel space file name and switch the early init code over to it.
--- fs/internal.h | 2 +- fs/open.c | 2 +- init/do_mounts.h | 1 + init/fs.c | 18 ++++++++++++++++++ init/initramfs.c | 6 +++--- 5 files changed, 24 insertions(+), 5 deletions(-)
fs/internal.h +1 -1
@@ -129,7 +129,7 @@ long do_sys_ftruncate(unsigned int fd, loff_t length, int small);int do_fchmodat (int dfd,const char __user *filename,umode_t mode);int do_fchownat (int dfd,const char __user *filename,uid_t user,gid_t group,int flag); - +int chown_common (const struct path *path,uid_t user,gid_t group);extern int vfs_open (const struct path *,struct file *);/*
fs/open.c +1 -1
@@ -639,7 +639,7 @@ SYSCALL_DEFINE2(chmod, const char __user *, filename, umode_t, mode)return do_fchmodat (AT_FDCWD , filename, mode); } -static int chown_common (const struct path *path,uid_t user,gid_t group) +int chown_common (const struct path *path,uid_t user,gid_t group) {struct inode *inode = path->dentry->d_inode;struct inode *delegated_inode =NULL ;
init/do_mounts.h +1 -0
@@ -13,6 +13,7 @@ int __init init_mount(const char *dev_name, const char *dir_name, const char *type_page, unsigned long flags, void *data_page);int __init init_chdir (const char *filename);int __init init_chroot (const char *filename); +int __init init_chown (const char *filename,uid_t user,gid_t group,int flags);int __init init_unlink (const char *pathname);int __init init_rmdir (const char *pathname);
init/fs.c +18 -0
@@ -59,6 +59,24 @@ int __init init_chroot(const char *filename)return error; } +int __init init_chown (const char *filename,uid_t user,gid_t group,int flags) +{ +int lookup_flags = (flags &AT_SYMLINK_NOFOLLOW ) ?0 :LOOKUP_FOLLOW ; +struct path path; +int error; + + error =kern_path (filename, lookup_flags, &path); +if (error) +return error; + error =mnt_want_write (path.mnt); +if (!error) { + error =chown_common (&path, user, group); +mnt_drop_write (path.mnt); + } +path_put (&path); +return error; +} +int __init init_unlink (const char *pathname) {return do_unlinkat (AT_FDCWD ,getname_kernel (pathname));
init/initramfs.c +3 -3
@@ -353,14 +353,14 @@ static int __init do_name(void) } }else if (S_ISDIR (mode)) {ksys_mkdir (collected, mode); -ksys_chown (collected, uid, gid); +init_chown (collected, uid, gid,0 );ksys_chmod (collected, mode);dir_add (collected, mtime); }else if (S_ISBLK (mode) ||S_ISCHR (mode) ||S_ISFIFO (mode) ||S_ISSOCK (mode)) {if (maybe_link () ==0 ) {ksys_mknod (collected, mode, rdev); -ksys_chown (collected, uid, gid); +init_chown (collected, uid, gid,AT_SYMLINK_NOFOLLOW );ksys_chmod (collected, mode);do_utime (collected, mtime); }
@@ -398,7 +398,7 @@ static int __init do_symlink(void) collected[N_ALIGN (name_len) + body_len] ='\0' ;clean_path (collected,0 );ksys_symlink (collected +N_ALIGN (name_len), collected); -ksys_lchown (collected, uid, gid); +init_chown (collected, uid, gid,AT_SYMLINK_NOFOLLOW );do_utime (collected, mtime); state = SkipIt; next_state = Reset;
Signature · 1 line
2.27.0
PATCH 18/24 init: add an init_chmod helper
In reply to Christoph HellwigAdd a simple helper to chmod with a kernel space file name and switch the early init code over to it.
--- fs/internal.h | 2 +- fs/open.c | 4 ++-- include/linux/syscalls.h | 7 ------- init/do_mounts.h | 1 + init/fs.c | 13 +++++++++++++ init/initramfs.c | 4 ++-- 6 files changed, 19 insertions(+), 12 deletions(-)
fs/internal.h +1 -1
@@ -126,7 +126,7 @@ extern struct open_how build_open_how(int flags, umode_t mode);extern int build_open_flags (const struct open_how *how,struct open_flags *op);long do_sys_ftruncate (unsigned int fd,loff_t length,int small); -int do_fchmodat (int dfd,const char __user *filename,umode_t mode); +int chmod_common (const struct path *path,umode_t mode);int do_fchownat (int dfd,const char __user *filename,uid_t user,gid_t group,int flag);int chown_common (const struct path *path,uid_t user,gid_t group);
fs/open.c +2 -2
@@ -563,7 +563,7 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)return error; } -static int chmod_common (const struct path *path,umode_t mode) +int chmod_common (const struct path *path,umode_t mode) {struct inode *inode = path->dentry->d_inode;struct inode *delegated_inode =NULL ;
@@ -610,7 +610,7 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, umode_t, mode)return err; } -int do_fchmodat (int dfd,const char __user *filename,umode_t mode) +static int do_fchmodat (int dfd,const char __user *filename,umode_t mode) {struct path path;int error;
include/linux/syscalls.h +0 -7
@@ -1304,13 +1304,6 @@ static inline long ksys_link(const char __user *oldname,return do_linkat (AT_FDCWD , oldname,AT_FDCWD , newname,0 ); } -extern int do_fchmodat (int dfd,const char __user *filename,umode_t mode); - -static inline int ksys_chmod (const char __user *filename,umode_t mode) -{ -return do_fchmodat (AT_FDCWD , filename, mode); -} -long do_faccessat (int dfd,const char __user *filename,int mode,int flags);static inline long ksys_access (const char __user *filename,int mode)
init/do_mounts.h +1 -0
@@ -14,6 +14,7 @@ int __init init_mount(const char *dev_name, const char *dir_name,int __init init_chdir (const char *filename);int __init init_chroot (const char *filename);int __init init_chown (const char *filename,uid_t user,gid_t group,int flags); +int __init init_chmod (const char *filename,umode_t mode);int __init init_unlink (const char *pathname);int __init init_rmdir (const char *pathname);
init/fs.c +13 -0
@@ -77,6 +77,19 @@ int __init init_chown(const char *filename, uid_t user, gid_t group, int flags)return error; } +int __init init_chmod (const char *filename,umode_t mode) +{ +struct path path; +int error; + + error =kern_path (filename,LOOKUP_FOLLOW , &path); +if (error) +return error; + error =chmod_common (&path, mode); +path_put (&path); +return error; +} +int __init init_unlink (const char *pathname) {return do_unlinkat (AT_FDCWD ,getname_kernel (pathname));
init/initramfs.c +2 -2
@@ -354,14 +354,14 @@ static int __init do_name(void) }else if (S_ISDIR (mode)) {ksys_mkdir (collected, mode);init_chown (collected, uid, gid,0 ); -ksys_chmod (collected, mode); +init_chmod (collected, mode);dir_add (collected, mtime); }else if (S_ISBLK (mode) ||S_ISCHR (mode) ||S_ISFIFO (mode) ||S_ISSOCK (mode)) {if (maybe_link () ==0 ) {ksys_mknod (collected, mode, rdev);init_chown (collected, uid, gid,AT_SYMLINK_NOFOLLOW ); -ksys_chmod (collected, mode); +init_chmod (collected, mode);do_utime (collected, mtime); } }
Signature · 1 line
2.27.0
PATCH 19/24 init: add an init_eaccess helper
In reply to Christoph HellwigAdd a simple helper to check if a file exists based on kernel space file name and switch the early init code over to it. Note that this theoretically changes behavior as it always is based on the effective permissions. But during early init that doesn't make a difference.
--- fs/open.c | 2 +- include/linux/syscalls.h | 7 ------- init/do_mounts.h | 1 + init/fs.c | 13 +++++++++++++ init/main.c | 3 +-- 5 files changed, 16 insertions(+), 10 deletions(-)
fs/open.c +1 -1
@@ -394,7 +394,7 @@ static const struct cred *access_override_creds(void)return old_cred; } -long do_faccessat (int dfd,const char __user *filename,int mode,int flags) +static long do_faccessat (int dfd,const char __user *filename,int mode,int flags) {struct path path;struct inode *inode;
include/linux/syscalls.h +0 -7
@@ -1304,13 +1304,6 @@ static inline long ksys_link(const char __user *oldname,return do_linkat (AT_FDCWD , oldname,AT_FDCWD , newname,0 ); } -long do_faccessat (int dfd,const char __user *filename,int mode,int flags); - -static inline long ksys_access (const char __user *filename,int mode) -{ -return do_faccessat (AT_FDCWD , filename, mode,0 ); -} -extern int do_fchownat (int dfd,const char __user *filename,uid_t user,gid_t group,int flag);
init/do_mounts.h +1 -0
@@ -15,6 +15,7 @@ int __init init_chdir(const char *filename);int __init init_chroot (const char *filename);int __init init_chown (const char *filename,uid_t user,gid_t group,int flags);int __init init_chmod (const char *filename,umode_t mode); +int __init init_eaccess (const char *filename);int __init init_unlink (const char *pathname);int __init init_rmdir (const char *pathname);
init/fs.c +13 -0
@@ -90,6 +90,19 @@ int __init init_chmod(const char *filename, umode_t mode)return error; } +int __init init_eaccess (const char *filename) +{ +struct path path; +int error; + + error =kern_path (filename,LOOKUP_FOLLOW , &path); +if (error) +return error; + error =inode_permission (d_inode (path.dentry),MAY_ACCESS ); +path_put (&path); +return error; +} +int __init init_unlink (const char *pathname) {return do_unlinkat (AT_FDCWD ,getname_kernel (pathname));
init/main.c +1 -2
@@ -1516,8 +1516,7 @@ static noinline void __init kernel_init_freeable(void)* check if there is an early userspace init. If yes, let it do all * the work */ -if (ksys_access ((const char __user *) - ramdisk_execute_command,0 ) !=0 ) { +if (init_eaccess (ramdisk_execute_command) !=0 ) { ramdisk_execute_command =NULL ;prepare_namespace (); }
Signature · 1 line
2.27.0
PATCH 20/24 init: add an init_link helper
In reply to Christoph HellwigAdd a simple helper to link with a kernel space file name and switch the early init code over to it. Remove the now unused ksys_link.
--- fs/internal.h | 3 +-- fs/namei.c | 4 ++-- include/linux/syscalls.h | 9 --------- init/do_mounts.h | 1 + init/fs.c | 33 +++++++++++++++++++++++++++++++++ init/initramfs.c | 2 +- 6 files changed, 38 insertions(+), 14 deletions(-)
fs/internal.h +1 -2
@@ -69,8 +69,7 @@ long do_rmdir(int dfd, struct filename *name);long do_unlinkat (int dfd,struct filename *name);long do_symlinkat (const char __user *oldname,int newdfd,const char __user *newname); -int do_linkat (int olddfd,const char __user *oldname,int newdfd, -const char __user *newname,int flags); +int may_linkat (struct path *link);/* * namespace.c
fs/namei.c +2 -2
@@ -1024,7 +1024,7 @@ static bool safe_hardlink_source(struct inode *inode)* * Returns 0 if successful, -ve on error. */ -static int may_linkat (struct path *link) +int may_linkat (struct path *link) {struct inode *inode = link->dentry->d_inode;
@@ -4086,7 +4086,7 @@ EXPORT_SYMBOL(vfs_link);* with linux 2.0, and to avoid hard-linking to directories * and other special files. --ADM */ -int do_linkat (int olddfd,const char __user *oldname,int newdfd, +static int do_linkat (int olddfd,const char __user *oldname,int newdfd,const char __user *newname,int flags) {struct dentry *new_dentry;
include/linux/syscalls.h +0 -9
@@ -1295,15 +1295,6 @@ static inline long ksys_mknod(const char __user *filename, umode_t mode,return do_mknodat (AT_FDCWD , filename, mode, dev); } -extern int do_linkat (int olddfd,const char __user *oldname,int newdfd, -const char __user *newname,int flags); - -static inline long ksys_link (const char __user *oldname, -const char __user *newname) -{ -return do_linkat (AT_FDCWD , oldname,AT_FDCWD , newname,0 ); -} -extern int do_fchownat (int dfd,const char __user *filename,uid_t user,gid_t group,int flag);
init/do_mounts.h +1 -0
@@ -16,6 +16,7 @@ int __init init_chroot(const char *filename);int __init init_chown (const char *filename,uid_t user,gid_t group,int flags);int __init init_chmod (const char *filename,umode_t mode);int __init init_eaccess (const char *filename); +int __init init_link (const char *oldname,const char *newname);int __init init_unlink (const char *pathname);int __init init_rmdir (const char *pathname);
init/fs.c +33 -0
@@ -103,6 +103,39 @@ int __init init_eaccess(const char *filename)return error; } +int __init init_link (const char *oldname,const char *newname) +{ +struct dentry *new_dentry; +struct path old_path, new_path; +int error; + + error =kern_path (oldname,0 , &old_path); +if (error) +return error; + + new_dentry =kern_path_create (AT_FDCWD , newname, &new_path,0 ); + error =PTR_ERR (new_dentry); +if (IS_ERR (new_dentry)) + goto out; + + error = -EXDEV ; +if (old_path.mnt != new_path.mnt) + goto out_dput; + error =may_linkat (&old_path); +if (unlikely (error)) + goto out_dput; + error =security_path_link (old_path.dentry, &new_path, new_dentry); +if (error) + goto out_dput; + error =vfs_link (old_path.dentry, new_path.dentry->d_inode, new_dentry, +NULL ); +out_dput: +done_path_create (&new_path, new_dentry); +out: +path_put (&old_path); +return error; +} +int __init init_unlink (const char *pathname) {return do_unlinkat (AT_FDCWD ,getname_kernel (pathname));
init/initramfs.c +1 -1
@@ -318,7 +318,7 @@ static int __init maybe_link(void)char *old =find_link (major, minor, ino, mode, collected);if (old) {clean_path (collected,0 ); -return (ksys_link (old, collected) <0 ) ?-1 :1 ; +return (init_link (old, collected) <0 ) ?-1 :1 ; } }return 0 ;
Signature · 1 line
2.27.0
PATCH 21/24 init: add an init_symlink helper
In reply to Christoph HellwigAdd a simple helper to symlink with a kernel space file name and switch the early init code over to it. Remove the now unused ksys_symlink.
--- fs/internal.h | 2 -- fs/namei.c | 2 +- include/linux/syscalls.h | 9 --------- init/do_mounts.h | 1 + init/fs.c | 22 ++++++++++++++++++++++ init/initramfs.c | 2 +- 6 files changed, 25 insertions(+), 13 deletions(-)
fs/internal.h +0 -2
@@ -67,8 +67,6 @@ long do_mknodat(int dfd, const char __user *filename, umode_t mode,long do_mkdirat (int dfd,const char __user *pathname,umode_t mode);long do_rmdir (int dfd,struct filename *name);long do_unlinkat (int dfd,struct filename *name); -long do_symlinkat (const char __user *oldname,int newdfd, -const char __user *newname);int may_linkat (struct path *link);/*
fs/namei.c +1 -1
@@ -3955,7 +3955,7 @@ int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname) }EXPORT_SYMBOL (vfs_symlink); -long do_symlinkat (const char __user *oldname,int newdfd, +static long do_symlinkat (const char __user *oldname,int newdfd,const char __user *newname) {int error;
include/linux/syscalls.h +0 -9
@@ -1277,15 +1277,6 @@ static inline long ksys_mkdir(const char __user *pathname, umode_t mode)return do_mkdirat (AT_FDCWD , pathname, mode); } -extern long do_symlinkat (const char __user *oldname,int newdfd, -const char __user *newname); - -static inline long ksys_symlink (const char __user *oldname, -const char __user *newname) -{ -return do_symlinkat (oldname,AT_FDCWD , newname); -} -extern long do_mknodat (int dfd,const char __user *filename,umode_t mode,unsigned int dev);
init/do_mounts.h +1 -0
@@ -17,6 +17,7 @@ int __init init_chown(const char *filename, uid_t user, gid_t group, int flags);int __init init_chmod (const char *filename,umode_t mode);int __init init_eaccess (const char *filename);int __init init_link (const char *oldname,const char *newname); +int __init init_symlink (const char *oldname,const char *newname);int __init init_unlink (const char *pathname);int __init init_rmdir (const char *pathname);
init/fs.c +22 -0
@@ -136,6 +136,28 @@ int __init init_link(const char *oldname, const char *newname)return error; } +int __init init_symlink (const char *oldname,const char *newname) +{ +struct filename *from =getname_kernel (oldname); +struct dentry *dentry; +struct path path; +int error; + +if (IS_ERR (from)) +return PTR_ERR (from); + dentry =kern_path_create (AT_FDCWD , newname, &path,0 ); + error =PTR_ERR (dentry); +if (IS_ERR (dentry)) + goto out_putname; + error =security_path_symlink (&path, dentry, from->name); +if (!error) + error =vfs_symlink (path.dentry->d_inode, dentry, from->name); +done_path_create (&path, dentry); +out_putname: +putname (from); +return error; +} +int __init init_unlink (const char *pathname) {return do_unlinkat (AT_FDCWD ,getname_kernel (pathname));
init/initramfs.c +1 -1
@@ -397,7 +397,7 @@ static int __init do_symlink(void) { collected[N_ALIGN (name_len) + body_len] ='\0' ;clean_path (collected,0 ); -ksys_symlink (collected +N_ALIGN (name_len), collected); +init_symlink (collected +N_ALIGN (name_len), collected);init_chown (collected, uid, gid,AT_SYMLINK_NOFOLLOW );do_utime (collected, mtime); state = SkipIt;
Signature · 1 line
2.27.0
Al Viro
maintainerRe: [PATCH 21/24] init: add an init_symlink helper
init/fs.c int __init init_link(const char *oldname, const char *newname) · line 141
Quoted 6 lines · Christoph Hellwig
Add a simple helper to symlink with a kernel space file name and switch the early init code over to it. Remove the now unused
ksys_symlink.init/fs.c +3
-0+int __init init_symlink (const char *oldname,const char *newname) +{ +struct filename *from =getname_kernel (oldname);
What the hell for? You are only using from ->name later.
Quoted 8 lines
init/fs.c +8
-0+struct dentry *dentry; +struct path path; +int error; + +if (IS_ERR (from)) +return PTR_ERR (from); + dentry =kern_path_create (AT_FDCWD , newname, &path,0 ); + error =PTR_ERR (dentry);
init/fs.c int __init init_link(const char *oldname, const char *newname) · line 159
Quoted 10 lines
init/fs.c +10
-0+if (IS_ERR (dentry)) + goto out_putname; + error =security_path_symlink (&path, dentry, from->name); +if (!error) + error =vfs_symlink (path.dentry->d_inode, dentry, from->name); +done_path_create (&path, dentry); +out_putname: +putname (from); +return error; +}
And again, the same comment regarding the location of file.
PATCH 22/24 init: add an init_mkdir helper
In reply to Christoph HellwigAdd a simple helper to mkdir with a kernel space file name and switch the early init code over to it. Remove the now unused ksys_mkdir.
--- fs/internal.h | 1 - fs/namei.c | 2 +- include/linux/syscalls.h | 7 ------- init/do_mounts.h | 1 + init/do_mounts_initrd.c | 2 +- init/fs.c | 18 ++++++++++++++++++ init/initramfs.c | 2 +- init/noinitramfs.c | 5 +++-- 8 files changed, 25 insertions(+), 13 deletions(-)
fs/internal.h +0 -1
@@ -64,7 +64,6 @@ 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,unsigned int dev); -long do_mkdirat (int dfd,const char __user *pathname,umode_t mode);long do_rmdir (int dfd,struct filename *name);long do_unlinkat (int dfd,struct filename *name);int may_linkat (struct path *link);
fs/namei.c +1 -1
@@ -3645,7 +3645,7 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) }EXPORT_SYMBOL (vfs_mkdir); -long do_mkdirat (int dfd,const char __user *pathname,umode_t mode) +static long do_mkdirat (int dfd,const char __user *pathname,umode_t mode) {struct dentry *dentry;struct path path;
include/linux/syscalls.h +0 -7
@@ -1270,13 +1270,6 @@ int compat_ksys_ipc(u32 call, int first, int second,* The following kernel syscall equivalents are just wrappers to fs-internal * functions. Therefore, provide stubs to be inlined at the callsites. */ -extern long do_mkdirat (int dfd,const char __user *pathname,umode_t mode); - -static inline long ksys_mkdir (const char __user *pathname,umode_t mode) -{ -return do_mkdirat (AT_FDCWD , pathname, mode); -} -extern long do_mknodat (int dfd,const char __user *filename,umode_t mode,unsigned int dev);
init/do_mounts.h +1 -0
@@ -19,6 +19,7 @@ int __init init_eaccess(const char *filename);int __init init_link (const char *oldname,const char *newname);int __init init_symlink (const char *oldname,const char *newname);int __init init_unlink (const char *pathname); +int __init init_mkdir (const char *pathname,umode_t mode);int __init init_rmdir (const char *pathname);void mount_block_root (char *name,int flags);
init/do_mounts_initrd.c +1 -1
@@ -82,7 +82,7 @@ static void __init handle_initrd(void)create_dev ("/dev/root.old" , Root_RAM0);/* mount initrd on rootfs' /root */ mount_block_root ("/dev/root.old" , root_mountflags & ~MS_RDONLY ); -ksys_mkdir ("/old" ,0700 ); +init_mkdir ("/old" ,0700 );init_chdir ("/old" );/*
init/fs.c +18 -0
@@ -163,6 +163,24 @@ int __init init_unlink(const char *pathname)return do_unlinkat (AT_FDCWD ,getname_kernel (pathname)); } +int __init init_mkdir (const char *pathname,umode_t mode) +{ +struct dentry *dentry; +struct path path; +int error; + + dentry =kern_path_create (AT_FDCWD , pathname, &path,LOOKUP_DIRECTORY ); +if (IS_ERR (dentry)) +return PTR_ERR (dentry); +if (!IS_POSIXACL (path.dentry->d_inode)) + mode &= ~current_umask (); + error =security_path_mkdir (&path, dentry, mode); +if (!error) + error =vfs_mkdir (path.dentry->d_inode, dentry, mode); +done_path_create (&path, dentry); +return error; +} +int __init init_rmdir (const char *pathname) {return do_rmdir (AT_FDCWD ,getname_kernel (pathname));
init/initramfs.c +1 -1
@@ -352,7 +352,7 @@ static int __init do_name(void) state = CopyFile; } }else if (S_ISDIR (mode)) { -ksys_mkdir (collected, mode); +init_mkdir (collected, mode);init_chown (collected, uid, gid,0 );init_chmod (collected, mode);dir_add (collected, mtime);
init/noinitramfs.c +3 -2
@@ -9,6 +9,7 @@#include <linux/stat.h> #include <linux/kdev_t.h> #include <linux/syscalls.h> +#include "do_mounts.h" /* * Create a simple rootfs that is similar to the default initramfs
@@ -17,7 +18,7 @@ static int __init default_rootfs(void) {int err; - err =ksys_mkdir ((const char __user __force *)"/dev" ,0755 ); + err =init_mkdir ("/dev" ,0755 );if (err <0 ) goto out;
@@ -27,7 +28,7 @@ static int __init default_rootfs(void)if (err <0 ) goto out; - err =ksys_mkdir ((const char __user __force *)"/root" ,0700 ); + err =init_mkdir ("/root" ,0700 );if (err <0 ) goto out;
Signature · 1 line
2.27.0
PATCH 23/24 init: add an init_mknod helper
In reply to Christoph HellwigAdd a simple helper to mknod with a kernel space file name and switch the early init code over to it. Remove the now unused ksys_mknod.
--- fs/internal.h | 2 -- fs/namei.c | 2 +- include/linux/syscalls.h | 9 --------- init/do_mounts.h | 3 ++- init/fs.c | 25 +++++++++++++++++++++++++ init/initramfs.c | 2 +- init/noinitramfs.c | 3 +-- 7 files changed, 30 insertions(+), 16 deletions(-)
fs/internal.h +0 -2
@@ -62,8 +62,6 @@ extern int filename_lookup(int dfd, struct filename *name, unsigned flags, struct path *path, struct path *root);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, -unsigned int dev);long do_rmdir (int dfd,struct filename *name);long do_unlinkat (int dfd,struct filename *name);int may_linkat (struct path *link);
fs/namei.c +1 -1
@@ -3564,7 +3564,7 @@ static int may_mknod(umode_t mode) } } -long do_mknodat (int dfd,const char __user *filename,umode_t mode, +static long do_mknodat (int dfd,const char __user *filename,umode_t mode,unsigned int dev) {struct dentry *dentry;
include/linux/syscalls.h +0 -9
@@ -1270,15 +1270,6 @@ int compat_ksys_ipc(u32 call, int first, int second,* The following kernel syscall equivalents are just wrappers to fs-internal * functions. Therefore, provide stubs to be inlined at the callsites. */ -extern long do_mknodat (int dfd,const char __user *filename,umode_t mode, -unsigned int dev); - -static inline long ksys_mknod (const char __user *filename,umode_t mode, -unsigned int dev) -{ -return do_mknodat (AT_FDCWD , filename, mode, dev); -} -extern int do_fchownat (int dfd,const char __user *filename,uid_t user,gid_t group,int flag);
init/do_mounts.h +2 -1
@@ -16,6 +16,7 @@ int __init init_chroot(const char *filename);int __init init_chown (const char *filename,uid_t user,gid_t group,int flags);int __init init_chmod (const char *filename,umode_t mode);int __init init_eaccess (const char *filename); +int __init init_mknod (const char *filename,umode_t mode,unsigned int dev);int __init init_link (const char *oldname,const char *newname);int __init init_symlink (const char *oldname,const char *newname);int __init init_unlink (const char *pathname);
@@ -30,7 +31,7 @@ extern int root_mountflags;static inline __init int create_dev (char *name,dev_t dev) {init_unlink (name); -return ksys_mknod (name,S_IFBLK |0600 ,new_encode_dev (dev)); +return init_mknod (name,S_IFBLK |0600 ,new_encode_dev (dev)); }#ifdef CONFIG_BLK_DEV_RAM
init/fs.c +25 -0
@@ -103,6 +103,31 @@ int __init init_eaccess(const char *filename)return error; } +int __init init_mknod (const char *filename,umode_t mode,unsigned int dev) +{ +struct dentry *dentry; +struct path path; +int error; + +if (S_ISFIFO (mode) ||S_ISSOCK (mode)) + dev =0 ; +else if (!(S_ISBLK (mode) ||S_ISCHR (mode))) +return -EINVAL ; + + dentry =user_path_create (AT_FDCWD , filename, &path,0 ); +if (IS_ERR (dentry)) +return PTR_ERR (dentry); + +if (!IS_POSIXACL (path.dentry->d_inode)) + mode &= ~current_umask (); + error =security_path_mknod (&path, dentry, mode, dev); +if (!error) + error =vfs_mknod (path.dentry->d_inode, dentry, mode, +new_decode_dev (dev)); +done_path_create (&path, dentry); +return error; +} +int __init init_link (const char *oldname,const char *newname) {struct dentry *new_dentry;
init/initramfs.c +1 -1
@@ -359,7 +359,7 @@ static int __init do_name(void) }else if (S_ISBLK (mode) ||S_ISCHR (mode) ||S_ISFIFO (mode) ||S_ISSOCK (mode)) {if (maybe_link () ==0 ) { -ksys_mknod (collected, mode, rdev); +init_mknod (collected, mode, rdev);init_chown (collected, uid, gid,AT_SYMLINK_NOFOLLOW );init_chmod (collected, mode);do_utime (collected, mtime);
init/noinitramfs.c +1 -2
@@ -22,8 +22,7 @@ static int __init default_rootfs(void)if (err <0 ) goto out; - err =ksys_mknod ((const char __user __force *)"/dev/console" , -S_IFCHR |S_IRUSR |S_IWUSR , + err =init_mknod ("/dev/console" ,S_IFCHR |S_IRUSR |S_IWUSR ,new_encode_dev (MKDEV (5 ,1 )));if (err <0 ) goto out;
Signature · 1 line
2.27.0
Al Viro
maintainerRe: [PATCH 23/24] init: add an init_mknod helper
Quoted 4 lines · Christoph Hellwig
init/fs.c +4
-0+int __init init_mknod (const char *filename,umode_t mode,unsigned int dev) +{ +struct dentry *dentry; +struct path path;
init/fs.c int __init init_eaccess(const char *filename) · line 119
Quoted 10 lines
init/fs.c +10
-0+int error; + +if (S_ISFIFO (mode) ||S_ISSOCK (mode)) + dev =0 ; +else if (!(S_ISBLK (mode) ||S_ISCHR (mode))) +return -EINVAL ; + + dentry =user_path_create (AT_FDCWD , filename, &path,0 ); +if (IS_ERR (dentry)) +return PTR_ERR (dentry);
user_path_create() is wrong here.
Quoted 44 lines
init/fs.c +11
-0+ +if (!IS_POSIXACL (path.dentry->d_inode)) + mode &= ~current_umask (); + error =security_path_mknod (&path, dentry, mode, dev); +if (!error) + error =vfs_mknod (path.dentry->d_inode, dentry, mode, +new_decode_dev (dev)); +done_path_create (&path, dentry); +return error; +} +int __init init_link (const char *oldname,const char *newname) {struct dentry *new_dentry;init/initramfs.c +1
-1@@ -359,7 +359,7 @@ static int __init do_name(void) }else if (S_ISBLK (mode) ||S_ISCHR (mode) ||S_ISFIFO (mode) ||S_ISSOCK (mode)) {if (maybe_link () ==0 ) { -ksys_mknod (collected, mode, rdev); +init_mknod (collected, mode, rdev);init_chown (collected, uid, gid,AT_SYMLINK_NOFOLLOW );init_chmod (collected, mode);do_utime (collected, mtime);init/noinitramfs.c +1
-2@@ -22,8 +22,7 @@ static int __init default_rootfs(void)if (err <0 ) goto out; - err =ksys_mknod ((const char __user __force *)"/dev/console" , -S_IFCHR |S_IRUSR |S_IWUSR , + err =init_mknod ("/dev/console" ,S_IFCHR |S_IRUSR |S_IWUSR ,new_encode_dev (MKDEV (5 ,1 )));if (err <0 ) goto out;Signature · 1 line
2.27.0
PATCH 24/24 init: add an init_lstat helper
In reply to Christoph HellwigAdd a simple helper to lstat with a kernel space file name and switch the early init code over to it. Remove the now unused ksys_lstat.
--- init/do_mounts.h | 1 + init/fs.c | 14 ++++++++++++++ init/initramfs.c | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-)
init/do_mounts.h +1 -0
@@ -16,6 +16,7 @@ int __init init_chroot(const char *filename);int __init init_chown (const char *filename,uid_t user,gid_t group,int flags);int __init init_chmod (const char *filename,umode_t mode);int __init init_eaccess (const char *filename); +int __init init_lstat (const char *filename,struct kstat *stat);int __init init_mknod (const char *filename,umode_t mode,unsigned int dev);int __init init_link (const char *oldname,const char *newname);int __init init_symlink (const char *oldname,const char *newname);
init/fs.c +14 -0
@@ -103,6 +103,20 @@ int __init init_eaccess(const char *filename)return error; } +int __init init_lstat (const char *filename,struct kstat *stat) +{ +struct path path; +int error; + + error =kern_path (filename,0 , &path); +if (error) +return error; + error =vfs_getattr (&path, stat,STATX_BASIC_STATS , +AT_SYMLINK_NOFOLLOW |AT_NO_AUTOMOUNT ); +path_put (&path); +return error; +} +int __init init_mknod (const char *filename,umode_t mode,unsigned int dev) {struct dentry *dentry;
init/initramfs.c +1 -1
@@ -304,7 +304,7 @@ static void __init clean_path(char *path, umode_t fmode) {struct kstat st; -if (!vfs_lstat (path, &st) && (st.mode ^ fmode) &S_IFMT ) { +if (!init_lstat (path, &st) && (st.mode ^ fmode) &S_IFMT ) {if (S_ISDIR (st.mode))init_rmdir (path);else
Signature · 1 line
2.27.0