linux-kernel - [PATCH v5 3/3] init/do_mounts.c: fix rootfs_fs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri,  4 Jun 2021 05:07:27 -0700
From:   menglong8.dong@...il.com
To:     christian.brauner@...ntu.com
Cc:     viro@...iv.linux.org.uk, keescook@...omium.org,
        samitolvanen@...gle.com, ojeda@...nel.org, johan@...nel.org,
        elver@...gle.com, masahiroy@...nel.org, dong.menglong@....com.cn,
        joe@...ches.com, axboe@...nel.dk, hare@...e.de, jack@...e.cz,
        gregkh@...uxfoundation.org, tj@...nel.org, song@...nel.org,
        neilb@...e.de, akpm@...ux-foundation.org, f.fainelli@...il.com,
        arnd@...db.de, palmerdabbelt@...gle.com,
        wangkefeng.wang@...wei.com, linux@...musvillemoes.dk,
        brho@...gle.com, mhiramat@...nel.org, rostedt@...dmis.org,
        vbabka@...e.cz, pmladek@...e.com, glider@...gle.com,
        chris@...isdown.name, ebiederm@...ssion.com, jojing64@...il.com,
        geert@...ux-m68k.org, mingo@...nel.org, terrelln@...com,
        linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org,
        mcgrof@...nel.org, jeyu@...nel.org, bhelgaas@...gle.com,
        josh@...htriplett.org
Subject: [PATCH v5 3/3] init/do_mounts.c: fix rootfs_fs_type with ramfs

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

As for the existence of second mount which is introduced in previous
patch, 'rootfs_fs_type', which is used as the root of mount tree, is
not used directly any more. So it make no sense to make it tmpfs
while 'CONFIG_INITRAMFS_MOUNT' is enabled.

Make 'rootfs_fs_type' ramfs when 'CONFIG_INITRAMFS_MOUNT' enabled.

Signed-off-by: Menglong Dong <dong.menglong@....com.cn>
---
 include/linux/init.h |  4 ++++
 init/do_mounts.c     | 16 ++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/include/linux/init.h b/include/linux/init.h
index 889d538b6dfa..2309c066c383 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -148,7 +148,11 @@ extern unsigned int reset_devices;
 /* used by init/main.c */
 void setup_arch(char **);
 void prepare_namespace(void);
+#ifndef CONFIG_INITRAMFS_MOUNT
 void __init init_rootfs(void);
+#else
+static inline void __init init_rootfs(void) { }
+#endif
 bool ramdisk_exec_exist(void);
 extern struct file_system_type rootfs_fs_type;
 
diff --git a/init/do_mounts.c b/init/do_mounts.c
index ec914552d5bb..240192894892 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -660,7 +660,10 @@ void __init finish_mount_rootfs(void)
 	else
 		revert_mount_rootfs();
 }
-#endif
+
+#define rootfs_init_fs_context ramfs_init_fs_context
+
+#else
 
 static bool is_tmpfs;
 static int rootfs_init_fs_context(struct fs_context *fc)
@@ -671,13 +674,14 @@ static int rootfs_init_fs_context(struct fs_context *fc)
 	return ramfs_init_fs_context(fc);
 }
 
+void __init init_rootfs(void)
+{
+	is_tmpfs = is_tmpfs_enabled();
+}
+#endif
+
 struct file_system_type rootfs_fs_type = {
 	.name		= "rootfs",
 	.init_fs_context = rootfs_init_fs_context,
 	.kill_sb	= kill_litter_super,
 };
-
-void __init init_rootfs(void)
-{
-	is_tmpfs = is_tmpfs_enabled();
-}
-- 
2.32.0.rc0