All of lore.kernel.org
 help / color / mirror / Atom feed
From: menglong8.dong@gmail.com
To: christian.brauner@ubuntu.com
Cc: viro@zeniv.linux.org.uk, keescook@chromium.org,
	samitolvanen@google.com, johan@kernel.org, ojeda@kernel.org,
	akpm@linux-foundation.org, dong.menglong@zte.com.cn,
	masahiroy@kernel.org, joe@perches.com, hare@suse.de,
	axboe@kernel.dk, jack@suse.cz, tj@kernel.org,
	gregkh@linuxfoundation.org, song@kernel.org, neilb@suse.de,
	brho@google.com, mcgrof@kernel.org, palmerdabbelt@google.com,
	arnd@arndb.de, f.fainelli@gmail.com, linux@rasmusvillemoes.dk,
	wangkefeng.wang@huawei.com, mhiramat@kernel.org,
	rostedt@goodmis.org, vbabka@suse.cz, pmladek@suse.com,
	glider@google.com, chris@chrisdown.name, ebiederm@xmission.com,
	jojing64@gmail.com, mingo@kernel.org, terrelln@fb.com,
	geert@linux-m68k.org, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org, jeyu@kernel.org,
	bhelgaas@google.com, josh@joshtriplett.org
Subject: [PATCH v4 1/3] init/main.c: introduce function ramdisk_exec_exist()
Date: Wed,  2 Jun 2021 22:46:28 +0800	[thread overview]
Message-ID: <20210602144630.161982-2-dong.menglong@zte.com.cn> (raw)
In-Reply-To: <20210602144630.161982-1-dong.menglong@zte.com.cn>

From: Menglong Dong <dong.menglong@zte.com.cn>

Introduce the function ramdisk_exec_exist, which is used to check the
exist of 'ramdisk_execute_command'.

To make path lookup follow the mount on '/', use vfs_path_lookup() in
init_eaccess(), and make the filesystem that mounted on '/' as root
during path lookup.

Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
---
 fs/init.c   | 11 +++++++++--
 init/main.c |  7 ++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/fs/init.c b/fs/init.c
index 5c36adaa9b44..166356a1f15f 100644
--- a/fs/init.c
+++ b/fs/init.c
@@ -112,14 +112,21 @@ int __init init_chmod(const char *filename, umode_t mode)
 
 int __init init_eaccess(const char *filename)
 {
-	struct path path;
+	struct path path, root;
 	int error;
 
-	error = kern_path(filename, LOOKUP_FOLLOW, &path);
+	error = kern_path("/", LOOKUP_DOWN, &root);
 	if (error)
 		return error;
+	error = vfs_path_lookup(root.dentry, root.mnt, filename,
+				LOOKUP_FOLLOW, &path);
+	if (error)
+		goto on_err;
 	error = path_permission(&path, MAY_ACCESS);
+
 	path_put(&path);
+on_err:
+	path_put(&root);
 	return error;
 }
 
diff --git a/init/main.c b/init/main.c
index eb01e121d2f1..1153571ca977 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1522,6 +1522,11 @@ void __init console_on_rootfs(void)
 	fput(file);
 }
 
+bool __init ramdisk_exec_exist(void)
+{
+	return init_eaccess(ramdisk_execute_command) == 0;
+}
+
 static noinline void __init kernel_init_freeable(void)
 {
 	/*
@@ -1568,7 +1573,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 (init_eaccess(ramdisk_execute_command) != 0) {
+	if (!ramdisk_exec_exist()) {
 		ramdisk_execute_command = NULL;
 		prepare_namespace();
 	}
-- 
2.32.0.rc0


  reply	other threads:[~2021-06-02 14:47 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-02 14:46 [PATCH v4 0/3] init/initramfs.c: make initramfs support pivot_root menglong8.dong
2021-06-02 14:46 ` menglong8.dong [this message]
2021-06-02 14:46 ` [PATCH v4 2/3] init/do_mounts.c: create second mount for initramfs menglong8.dong
2021-06-03 13:30   ` Christian Brauner
2021-06-03 15:05     ` Menglong Dong
2021-06-04  9:59       ` Christian Brauner
2021-06-02 14:46 ` [PATCH v4 3/3] init/do_mounts.c: fix rootfs_fs_type with ramfs menglong8.dong

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=20210602144630.161982-2-dong.menglong@zte.com.cn \
    --to=menglong8.dong@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=axboe@kernel.dk \
    --cc=bhelgaas@google.com \
    --cc=brho@google.com \
    --cc=chris@chrisdown.name \
    --cc=christian.brauner@ubuntu.com \
    --cc=dong.menglong@zte.com.cn \
    --cc=ebiederm@xmission.com \
    --cc=f.fainelli@gmail.com \
    --cc=geert@linux-m68k.org \
    --cc=glider@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hare@suse.de \
    --cc=jack@suse.cz \
    --cc=jeyu@kernel.org \
    --cc=joe@perches.com \
    --cc=johan@kernel.org \
    --cc=jojing64@gmail.com \
    --cc=josh@joshtriplett.org \
    --cc=keescook@chromium.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@rasmusvillemoes.dk \
    --cc=masahiroy@kernel.org \
    --cc=mcgrof@kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@kernel.org \
    --cc=neilb@suse.de \
    --cc=ojeda@kernel.org \
    --cc=palmerdabbelt@google.com \
    --cc=pmladek@suse.com \
    --cc=rostedt@goodmis.org \
    --cc=samitolvanen@google.com \
    --cc=song@kernel.org \
    --cc=terrelln@fb.com \
    --cc=tj@kernel.org \
    --cc=vbabka@suse.cz \
    --cc=viro@zeniv.linux.org.uk \
    --cc=wangkefeng.wang@huawei.com \
    --subject='Re: [PATCH v4 1/3] init/main.c: introduce function ramdisk_exec_exist()' \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.