Received-SPF: pass (google.com: domain of linux-kernel+bounces-139736-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Yuntao Wang <ytcoode@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
	"Peter Zijlstra (Intel)" <peterz@infradead.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Josh Poimboeuf <jpoimboe@kernel.org>,
	"ndesaulniers@google.com" <ndesaulniers@google.com>,
	Tejun Heo <tj@kernel.org>,
	Christophe Leroy <christophe.leroy@csgroup.eu>,
	Krister Johansen <kjlx@templeofstupid.com>,
	Changbin Du <changbin.du@huawei.com>,
	Arnd Bergmann <arnd@arndb.de>,
	Geert Uytterhoeven <geert+renesas@glider.be>,
	Yuntao Wang <ytcoode@gmail.com>
Subject: [PATCH] init/main.c: Remove redundant space from saved_command_line
Date: Thu, 11 Apr 2024 12:12:00 +0800
Message-ID: <20240411041200.225356-1-ytcoode@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

extra_init_args ends with a space, so when concatenating extra_init_args
to saved_command_line, be sure to remove the extra space.

Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
---
 init/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/init/main.c b/init/main.c
index 2ca52474d0c3..cf2c22aa0e8c 100644
--- a/init/main.c
+++ b/init/main.c
@@ -660,12 +660,14 @@ static void __init setup_command_line(char *command_line)
 			strcpy(saved_command_line + len, extra_init_args);
 			len += ilen - 4;	/* strlen(extra_init_args) */
 			strcpy(saved_command_line + len,
-				boot_command_line + initargs_offs - 1);
+				boot_command_line + initargs_offs);
 		} else {
 			len = strlen(saved_command_line);
 			strcpy(saved_command_line + len, " -- ");
 			len += 4;
 			strcpy(saved_command_line + len, extra_init_args);
+			len += ilen - 4; /* strlen(extra_init_args) */
+			saved_command_line[len-1] = '\0'; /* remove trailing space */
 		}
 	}
 
-- 
2.44.0