linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: menglong8.dong@gmail.com
To: mcgrof@kernel.org
Cc: viro@zeniv.linux.org.uk, keescook@chromium.org,
	samitolvanen@google.com, johan@kernel.org, ojeda@kernel.org,
	jeyu@kernel.org, joe@perches.com, dong.menglong@zte.com.cn,
	masahiroy@kernel.org, jack@suse.cz, axboe@kernel.dk,
	hare@suse.de, gregkh@linuxfoundation.org, tj@kernel.org,
	song@kernel.org, neilb@suse.de, akpm@linux-foundation.org,
	brho@google.com, f.fainelli@gmail.com,
	wangkefeng.wang@huawei.com, arnd@arndb.de,
	linux@rasmusvillemoes.dk, mhiramat@kernel.org,
	rostedt@goodmis.org, vbabka@suse.cz, glider@google.com,
	pmladek@suse.com, ebiederm@xmission.com, jojing64@gmail.com,
	linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/3] init/main.c: introduce function ramdisk_exec_exist()
Date: Sat, 22 May 2021 19:31:53 +0800	[thread overview]
Message-ID: <20210522113155.244796-2-dong.menglong@zte.com.cn> (raw)
In-Reply-To: <20210522113155.244796-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'.

It can do absolute path and relative path check. For relative path,
it will ignore '/' and '.' in the start of
'ramdisk_execute_command'.

Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
---
 init/main.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/init/main.c b/init/main.c
index eb01e121d2f1..95cab17046e0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1522,6 +1522,21 @@ void __init console_on_rootfs(void)
 	fput(file);
 }
 
+bool __init ramdisk_exec_exist(bool absolute)
+{
+	char *tmp_command = ramdisk_execute_command;
+
+	if (!tmp_command)
+		return false;
+
+	if (!absolute) {
+		while (*tmp_command == '/' || *tmp_command == '.')
+			tmp_command++;
+	}
+
+	return init_eaccess(tmp_command) == 0;
+}
+
 static noinline void __init kernel_init_freeable(void)
 {
 	/*
@@ -1568,7 +1583,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(true)) {
 		ramdisk_execute_command = NULL;
 		prepare_namespace();
 	}
-- 
2.31.1


  reply	other threads:[~2021-05-22 11:32 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-22 11:31 [PATCH 0/3] init/initramfs.c: make initramfs support pivot_root menglong8.dong
2021-05-22 11:31 ` menglong8.dong [this message]
2021-05-25  1:02   ` [PATCH 1/3] init/main.c: introduce function ramdisk_exec_exist() Josh Triplett
2021-05-25  3:43     ` Menglong Dong
2021-05-25  8:04       ` Menglong Dong
2021-05-22 11:31 ` [PATCH 2/3] init/do_cmounts.c: introduce 'user_root' for initramfs menglong8.dong
2021-05-25  0:44   ` Luis Chamberlain
2021-05-25  3:28     ` Menglong Dong
2021-05-22 11:31 ` [PATCH 3/3] init/do_mounts.c: fix rootfs_fs_type with ramfs menglong8.dong
2021-05-24 21:47   ` Luis Chamberlain
2021-05-25  0:52   ` Luis Chamberlain

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=20210522113155.244796-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=brho@google.com \
    --cc=dong.menglong@zte.com.cn \
    --cc=ebiederm@xmission.com \
    --cc=f.fainelli@gmail.com \
    --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=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=neilb@suse.de \
    --cc=ojeda@kernel.org \
    --cc=pmladek@suse.com \
    --cc=rostedt@goodmis.org \
    --cc=samitolvanen@google.com \
    --cc=song@kernel.org \
    --cc=tj@kernel.org \
    --cc=vbabka@suse.cz \
    --cc=viro@zeniv.linux.org.uk \
    --cc=wangkefeng.wang@huawei.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).