From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 178D7478E36 for ; Tue, 15 Sep 2026 08:28:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.71 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460905; cv=none; b=jSJXFaoH9l65LwSQTvam8gwx722LjWHwN6VeBD4u+G6hMMZSCu8t6Ieb19hPF8gr9n6vmUd17zqddAfQIDN4KnHO+9Ftn1G2GUnk6uSJbS20OqoCLt3vsMmKqF8KoTyhPdUvnKr7dJzG6arJde/qvfjbl6EOMWlZeII+pP1qAig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460905; c=relaxed/simple; bh=LqJMFQGliTTZ9KNIvLTBQqllQDtaRAf0jEikiPuUKto=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=sajnd/bY8kbu6EDD8VvEvCN6QcHIRSMbDNn/CBTKYv0CVLf5Fn+8j1JPhPkh2jK01LbCuXrc/isTLwjPGUTHzxQglmgJFE8ctHok2qAFPMj07rJnz6Of+sGEamCiO2njFg1vtMILvf2fAOv5DH4YicdUxhXu1DB5pHuAFWya5LA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--morbo.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=t5CHpW58; arc=none smtp.client-ip=209.85.219.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--morbo.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="t5CHpW58" Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-91235881828so13160306d6.3 for ; Tue, 15 Sep 2026 01:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460901; x=1790065701; darn=vger.kernel.org; h=content-transfer-encoding:content-type:cc:to:from:subject :message-id:references:mime-version:in-reply-to:date:from:to:cc :subject:date:message-id:reply-to:content-type; bh=eELVo8fI0ZjlHs2eEJ49S4+N/SPMib/OwBxEH2gJjRU=; b=t5CHpW58OWEH+6fxyuQaFjdJpPBaD7B7+vYjWAtgrLNWTDeSdasjPF1i7f3TVop+WE X++DKhhH4XzJPiOEBoPPZGkoyDoWBoVwZY20HA9BpCq+VEbMo6UuTyUralw5fhw+LJoz eQeXOz8QTOXjd+Vmh6SqSZPcv4HnpF7dQKznPrWAOSKMxLRNzEVvzbh4g5liPi/UOY1G hV4NSytqb9JbAXiieXSaTq+Em+mP0BdLvRvbeSkFMqOT2hdQPQ2BzGbYINgW48R8poms 19l6nE7B5DiL5R6+0nXx8G3CN7Bh+rfJpOC7Z2T19ASaya2ALbsOKe7JGcHUv4HJCslb A+PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460901; x=1790065701; h=content-transfer-encoding:content-type:cc:to:from:subject :message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=eELVo8fI0ZjlHs2eEJ49S4+N/SPMib/OwBxEH2gJjRU=; b=0UaV1Y8vs/ARUXGI648HaH592xaDDGDdc000jrVnty8l/8w8/yUtfMs39dXxX14Dpg 2ELKfpdFrSqJDp/UbVZ+HFzsKLJH9oLS3GwW0ZhbwOTt9HCBnC81VW6U7uqWovw66tVL f20mO8+FAOtTAJQjavLTbf6PkKjZjVehMv0g7RwIsfpTB1/Wmk+kbdu1Ev22qBsXFNhT z7xFaqLNsoHqYnUbKaGOqVMo7/97Wq6opFpbqyazcKYrjfSlh3c/VmaC/UXzyNumMkhg TKrl0dyPaI1XFSpq9iIA0Uz9lNsqmo+CWj6IpU3UoemxBfczxNbY32VnSBYSV7t0kR84 dULw== X-Forwarded-Encrypted: i=1; AKwUvByLhCDzynWAkEInCLDwvaoqRX+7WpyDOCAmnXC1X20uEFwdqLZ5x58fRMRCFQe9WisVjn40zC4rQCk=@vger.kernel.org X-Gm-Message-State: AFuF++kkhNzbs4ieG1yMYCVYOp2t4nQ+7/BFstuvNoz/94KlR+sn2eqG 6BrWOOVyQUls2sgSzOKjjCjX57f1y3FpTw0OJdID7CuE0RxRN8zale85GR+74ocogyU2SY1d643 q X-Received: from plvv1.prod.google.com ([2002:a17:902:d081:b0:2ca:ceab:34a3]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f612:b0:2d8:d4dd:24c0 with SMTP id d9443c01a7336-2dd6c7e1a9fmr128970685ad.21.1789460409250; Tue, 15 Sep 2026 01:20:09 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:34 +0000 In-Reply-To: <20260915081910.4142719-1-morbo@google.com> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260915081910.4142719-1-morbo@google.com> X-Mailer: git-send-email 2.55.0.1032.g73a4cd73de-goog Message-ID: <20260915081910.4142719-18-morbo@google.com> Subject: [PATCH 17/28] MIPS: cmdline: Refactor bootcmdline_append() to use snprintf() From: Bill Wendling To: linux-kernel@vger.kernel.org Cc: Bill Wendling , codemender-patching+linux@google.com, Russell King , Huacai Chen , WANG Xuerui , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Ian Abbott , H Hartley Sweeten , Tony Luck , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matthew Brost , "=?UTF-8?q?Thomas=20Hellstr=C3=B6m?=" , Rodrigo Vivi , Dmitry Torokhov , Matthias Schwarzott , Mauro Carvalho Chehab , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Arend van Spriel , Rob Herring , Saravana Kannan , Krzysztof Kozlowski , Sylwester Nawrocki , Peter Griffin , Alim Akhtar , Linus Walleij , Anil Gurumurthy , Sudarsana Kalluru , "Martin K. Petersen" , Trond Myklebust , Anna Schumaker , Mike Marshall , Martin Brandenburg , Kees Cook , Jiri Pirko , Simon Horman , Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Jaroslav Kysela , Takashi Iwai , Andrew Morton , "Mike Rapoport (Microsoft)" , Kanglong Wang , Tiezhu Yang , Qiang Ma , Randy Dunlap , Pengpeng Hou , Ard Biesheuvel , Breno Leitao , Thorsten Blum , Harshit Mogalapalli , Greg Kroah-Hartman , Lyude Paul , Ashutosh Desai , Imre Deak , Dmitry Baryshkov , Johan Hovold , Johannes Berg , Miri Korenblit , Alexander Stein , Cryolitia PukNgae , Jiaming Zhang , Will Porter , Cen Zhang , "=?UTF-8?q?C=C3=A1ssio=20Gabriel?=" , Rong Zhang , Arun Raghavan , linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linux-edac@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-input@vger.kernel.org, linux-media@vger.kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-scsi@vger.kernel.org, linux-nfs@vger.kernel.org, devel@lists.orangefs.org, linux-hardening@vger.kernel.org, linux-sound@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable bootcmdline_append() passes "max" (the maximum length of the source string "s") as the destination buffer size argument to strlcat(). Because strlcat() expects the total size of the destination buffer (COMMAND_LINE_SIZE), it fails to append anything whenever "max" is smaller than the current length of boot_command_line, and could overflow boot_command_line if "max" exceeds COMMAND_LINE_SIZE. In preparation for removing the deprecated strlcat() API[1], replace the strlcat() calls with snprintf() using the "%.*s" precision specifier. This bounds the read from "s" to at most "max" bytes while properly respecting the remaining space in boot_command_line. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: SecurityEngineer:Gemini2.5Pro [editor_update_file, shell_comma= nd_run, make_kernel_build_single_file, test_runner_run_kunit_test] Signed-off-by: Bill Wendling --- Cc: Russell King Cc: Huacai Chen Cc: WANG Xuerui Cc: Thomas Bogendoerfer Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" Cc: Ian Abbott Cc: H Hartley Sweeten Cc: Tony Luck Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Simona Vetter Cc: Matthew Brost Cc: "Thomas Hellstr=C3=B6m" Cc: Rodrigo Vivi Cc: Dmitry Torokhov Cc: Matthias Schwarzott Cc: Mauro Carvalho Chehab Cc: Tony Nguyen Cc: Przemek Kitszel Cc: Andrew Lunn Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Arend van Spriel Cc: Rob Herring Cc: Saravana Kannan Cc: Krzysztof Kozlowski Cc: Sylwester Nawrocki Cc: Peter Griffin Cc: Alim Akhtar Cc: Linus Walleij Cc: Anil Gurumurthy Cc: Sudarsana Kalluru Cc: "Martin K. Petersen" Cc: Trond Myklebust Cc: Anna Schumaker Cc: Mike Marshall Cc: Martin Brandenburg Cc: Kees Cook Cc: Jiri Pirko Cc: Simon Horman Cc: Chuck Lever Cc: Jeff Layton Cc: NeilBrown Cc: Olga Kornievskaia Cc: Dai Ngo Cc: Tom Talpey Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Bill Wendling Cc: Andrew Morton Cc: "Mike Rapoport (Microsoft)" Cc: Kanglong Wang Cc: Tiezhu Yang Cc: Qiang Ma Cc: Randy Dunlap Cc: Pengpeng Hou Cc: Ard Biesheuvel Cc: Breno Leitao Cc: Thorsten Blum Cc: Harshit Mogalapalli Cc: Greg Kroah-Hartman Cc: Lyude Paul Cc: Ashutosh Desai Cc: Imre Deak Cc: Dmitry Baryshkov Cc: Johan Hovold Cc: Johannes Berg Cc: Miri Korenblit Cc: Alexander Stein Cc: Cryolitia PukNgae Cc: Jiaming Zhang Cc: Will Porter Cc: Cen Zhang Cc: "C=C3=A1ssio Gabriel" Cc: Rong Zhang Cc: Arun Raghavan Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: loongarch@lists.linux.dev Cc: linux-mips@vger.kernel.org Cc: linux-parisc@vger.kernel.org Cc: linux-edac@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: linux-input@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: brcm80211@lists.linux.dev Cc: brcm80211-dev-list.pdl@broadcom.com Cc: devicetree@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-gpio@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: linux-nfs@vger.kernel.org Cc: devel@lists.orangefs.org Cc: linux-hardening@vger.kernel.org Cc: linux-sound@vger.kernel.org --- arch/mips/kernel/setup.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 1ae6d0c0e1d6..0d9c2137d675 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -518,13 +518,28 @@ static void __init check_kernel_sections_mem(void) =20 static void __init bootcmdline_append(const char *s, size_t max) { + size_t len; + int prec; + if (!s[0] || !max) return; =20 - if (boot_command_line[0]) - strlcat(boot_command_line, " ", COMMAND_LINE_SIZE); + len =3D strlen(boot_command_line); + if (len >=3D COMMAND_LINE_SIZE - 1) + return; =20 - strlcat(boot_command_line, s, max); + if (len) { + if (COMMAND_LINE_SIZE - len < 3) + return; + + prec =3D min_t(size_t, max, COMMAND_LINE_SIZE - len - 2); + snprintf(boot_command_line + len, COMMAND_LINE_SIZE - len, " %.*s", + prec, s); + } else { + prec =3D min_t(size_t, max, COMMAND_LINE_SIZE - 1); + snprintf(boot_command_line, COMMAND_LINE_SIZE, "%.*s", + prec, s); + } } =20 #ifdef CONFIG_OF_EARLY_FLATTREE --=20 2.55.0.1032.g73a4cd73de-goog