Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Al Viro <viro@zeniv.linux.org.uk>,
	Linus Torvalds <torvalds@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	"Rafael J. Wysocki" <rafael@kernel.org>,
	linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
	linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org
Subject: [PATCH 19/24] init: add an init_eaccess helper
Date: Tue, 21 Jul 2020 18:28:13 +0200	[thread overview]
Message-ID: <20200721162818.197315-20-hch@lst.de> (raw)
In-Reply-To: <20200721162818.197315-1-hch@lst.de>

Add 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.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 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(-)

diff --git a/fs/open.c b/fs/open.c
index 7ba89eae46c560..aafecd1f7ba1a5 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -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;
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 8b71fa321ca20c..a2779638e41445 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -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);
 
diff --git a/init/do_mounts.h b/init/do_mounts.h
index b323d9755d7e5e..b886aaa0d09716 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -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);
 
diff --git a/init/fs.c b/init/fs.c
index c636f25c9a6d69..9929cdd19affbe 100644
--- a/init/fs.c
+++ b/init/fs.c
@@ -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));
diff --git a/init/main.c b/init/main.c
index b952e4cd685af4..227e206b9ffee2 100644
--- a/init/main.c
+++ b/init/main.c
@@ -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();
 	}
-- 
2.27.0


  parent reply	other threads:[~2020-07-21 16:29 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-21 16:27 add file system helpers that take kernel pointers for the init code v2 Christoph Hellwig
2020-07-21 16:27 ` [PATCH 01/24] fs: refactor do_mount Christoph Hellwig
2020-07-21 16:27 ` [PATCH 02/24] fs: refactor ksys_umount Christoph Hellwig
2020-07-21 16:27 ` [PATCH 03/24] fs: push the getname from do_rmdir into the callers Christoph Hellwig
2020-07-21 16:27 ` [PATCH 04/24] devtmpfs: open code do_mount Christoph Hellwig
2020-07-21 16:27 ` [PATCH 05/24] devtmpfs: open code ksys_chdir and ksys_chroot Christoph Hellwig
2020-07-21 16:49   ` Linus Torvalds
2020-07-21 17:16     ` Al Viro
2020-07-21 18:26       ` Christoph Hellwig
2020-07-21 16:28 ` [PATCH 06/24] md: open code vfs_stat in md_setup_drive Christoph Hellwig
2020-07-21 16:55   ` Al Viro
2020-07-21 18:27     ` Christoph Hellwig
2020-07-22  7:44       ` Al Viro
2020-07-22 14:05         ` Christoph Hellwig
2020-07-21 16:28 ` [PATCH 07/24] init: initialize ramdisk_execute_command at compile time Christoph Hellwig
2020-07-21 16:28 ` [PATCH 08/24] init: move the prepare_namespace prototype to init/do_mounts.h Christoph Hellwig
2020-07-21 16:28 ` [PATCH 09/24] init: mark create_dev as __init Christoph Hellwig
2020-07-21 16:28 ` [PATCH 10/24] init: open code ksys_umount in handle_initrd Christoph Hellwig
2020-07-21 16:28 ` [PATCH 11/24] init: open code do_utimes in do_utime Christoph Hellwig
2020-07-21 16:28 ` [PATCH 12/24] init: add an init_mount helper Christoph Hellwig
2020-07-21 16:58   ` Al Viro
2020-07-21 16:28 ` [PATCH 13/24] init: add an init_unlink helper Christoph Hellwig
2020-07-21 17:12   ` Al Viro
2020-07-21 16:28 ` [PATCH 14/24] init: add an init_rmdir helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 15/24] init: add an init_chdir helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 16/24] init: add an init_chroot helper Christoph Hellwig
2020-07-21 17:10   ` Al Viro
2020-07-21 16:28 ` [PATCH 17/24] init: add an init_chown helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 18/24] init: add an init_chmod helper Christoph Hellwig
2020-07-21 16:28 ` Christoph Hellwig [this message]
2020-07-21 16:28 ` [PATCH 20/24] init: add an init_link helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 21/24] init: add an init_symlink helper Christoph Hellwig
2020-07-21 17:00   ` Al Viro
2020-07-21 16:28 ` [PATCH 22/24] init: add an init_mkdir helper Christoph Hellwig
2020-07-21 16:28 ` [PATCH 23/24] init: add an init_mknod helper Christoph Hellwig
2020-07-21 17:02   ` Al Viro
2020-07-21 16:28 ` [PATCH 24/24] init: add an init_lstat helper Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200721162818.197315-20-hch@lst.de \
    --to=hch@lst.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-raid@vger.kernel.org \
    --cc=rafael@kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=viro@zeniv.linux.org.uk \
    --subject='Re: [PATCH 19/24] init: add an init_eaccess helper' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).