From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-178.mta0.migadu.com (out-178.mta0.migadu.com [91.218.175.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 48A713033F5 for ; Thu, 25 Jun 2026 15:02:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782399756; cv=none; b=TOJ6k/ILilnYPpnHUqYUg4lz54zO88Tui3VcPuS2OF2Y9xYG+2pLNsc4ZRXPwFuRDbnw3j+WfP+pHNSrAEy0Hqo23312pAo0CQNV/QtGqlqHm8XKGq6837iVhUFlyggRWTnc+7YzuxMPZwMx1YSjoiUZmkMM/VPrjt+r//ALIbU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782399756; c=relaxed/simple; bh=AHEnZWlPYDaatGBVMiUfpmBDFa/uW+CNxGMF2+qVcX0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=k7qcf5JpL5gwHdM1EpZiVy0NaAWQZISr9r8YUHrFWrCpK0Pz4G7qB/KoWD8A+JvU3asnemZhFuwb0TpkMf0RDGY8fOohQK/uujApJcX7uysidDdyKxyiVJu0lKWMqLDpV3hypbqLzG8K2OF3eNIBZR4hBJ1RhOwrkuuVukDeWrU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=GqIrf0vd; arc=none smtp.client-ip=91.218.175.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="GqIrf0vd" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1782399743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=P4QJwp1QO4pDD9YQvTdgnCc901AiYQ96b57Wi2E8LA0=; b=GqIrf0vd73+Y4hnPs+GUCrJeyQyYE/zVJID4lNTTwMDsNqdyv/sYl0BEpghjuIhVAUatfH hDCFIX9yc4x7VynLta4lVk0i29u/hdPWcT8rhrIU7yjWsOrJFQS3xR0brufS7p1On6pwMq l8plzrvjWS9zqx0nVwl2Zcj+LJzMOlw= From: Thorsten Blum To: Andy Shevchenko , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , Ard Biesheuvel , "Mike Rapoport (Microsoft)" , Thomas Zimmermann , Jiri Bohac , Harshit Mogalapalli Cc: Thorsten Blum , Ingo Molnar , linux-kernel@vger.kernel.org Subject: [PATCH v2] x86/setup: Replace strlcat() with snprintf() in setup_arch() Date: Thu, 25 Jun 2026 17:01:18 +0200 Message-ID: <20260625150119.705227-2-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1814; i=thorsten.blum@linux.dev; h=from:subject; bh=AHEnZWlPYDaatGBVMiUfpmBDFa/uW+CNxGMF2+qVcX0=; b=owGbwMvMwCUWt7pQ4caZUj3G02pJDFm2TvvX1k87fkbRroZniWGFd13lLK6TG019G6e5leQYP Joj/Neoo5SFQYyLQVZMkeXBrB8zfEtrKjeZROyEmcPKBDKEgYtTACZizMjw3998w67iBc0OQSkb LhVf2ip7JObQykMN968dk9VNfcsQ08fwP7Jd/duGS5yeZSx6C06ZLNQxM/K8lbIrs1zzV9tuzdR 6NgA= X-Developer-Key: i=thorsten.blum@linux.dev; a=openpgp; fpr=1D60735E8AEF3BE473B69D84733678FD8DFEEAD4 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT In preparation to remove strlcat() from the kernel [1], replace two strlcat() calls with snprintf() in setup_arch(). Also drop the explicit size argument to strscpy() to further simplify the code since strscpy() can determine the size automatically when the destination buffer has a fixed length. Link: https://github.com/KSPP/linux/issues/370 [1] Signed-off-by: Thorsten Blum --- Changes in v2: - Use a Link: tag as suggested by Andy - v1: https://lore.kernel.org/r/20260604131752.1327556-3-thorsten.blum@linux.dev/ --- arch/x86/kernel/setup.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 46882ce79c3a..b11b0ce31a27 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -915,16 +916,18 @@ void __init setup_arch(char **cmdline_p) strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); #else if (builtin_cmdline[0]) { + size_t len = strnlen(builtin_cmdline, COMMAND_LINE_SIZE); + /* append boot loader cmdline to builtin */ - strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE); - strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE); + snprintf(builtin_cmdline + len, COMMAND_LINE_SIZE - len, " %s", + boot_command_line); strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); } #endif builtin_cmdline_added = true; #endif - strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE); + strscpy(command_line, boot_command_line); *cmdline_p = command_line; /*