mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Pengpeng Hou <pengpeng@iscas.ac.cn>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
	"Maciej W. Rozycki" <macro@orcam.me.uk>
Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
	pengpeng@iscas.ac.cn
Subject: [PATCH 3/8] MIPS: lemote-2f: bound machtype command-line append
Date: Sat, 4 Apr 2026 22:06:16 +0800	[thread overview]
Message-ID: <20260405102003.3-mips-cmdline-pengpeng@iscas.ac.cn> (raw)
In-Reply-To: <20260405102000.0-mips-cmdline-series-pengpeng@iscas.ac.cn>

mach_prom_init_machtype() appends the synthesized machtype argument to
the fixed arcs_cmdline buffer with a chain of unchecked strcat() calls.
If the PROM command line is already near full, the extra machtype text
can run past the end of the buffer.

Switch the append steps to bounded concatenation.

Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
---
 arch/mips/loongson2ef/lemote-2f/machtype.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/mips/loongson2ef/lemote-2f/machtype.c b/arch/mips/loongson2ef/lemote-2f/machtype.c
index 9462a3ab57be..359fe7f826b8 100644
--- a/arch/mips/loongson2ef/lemote-2f/machtype.c
+++ b/arch/mips/loongson2ef/lemote-2f/machtype.c
@@ -34,8 +34,10 @@ void __init mach_prom_init_machtype(void)
 		else
 			mips_machtype = MACH_LEMOTE_NAS;
 
-		strcat(arcs_cmdline, " machtype=");
-		strcat(arcs_cmdline, get_system_type());
-		strcat(arcs_cmdline, " ");
-	}
+		strlcat(arcs_cmdline, " machtype=",
+			COMMAND_LINE_SIZE);
+		strlcat(arcs_cmdline, get_system_type(),
+			COMMAND_LINE_SIZE);
+		strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);
+	}
 }
-- 
2.50.1 (Apple Git-155)


  reply	other threads:[~2026-04-05  2:32 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-05  2:20 [PATCH 0/8] MIPS: bound early command-line construction Pengpeng Hou
2026-04-04 14:06 ` Pengpeng Hou [this message]
2026-04-04 14:06 ` [PATCH 1/8] MIPS: dec: bound PROM command-line appends Pengpeng Hou
2026-04-04 14:06 ` [PATCH 2/8] MIPS: sni: " Pengpeng Hou
2026-04-04 14:06 ` [PATCH 7/8] MIPS: malta-init: bound default console command-line append Pengpeng Hou
2026-04-05 16:08   ` Sergey Shtylyov
2026-04-06  5:30   ` Pengpeng Hou
2026-04-04 14:06 ` [PATCH 6/8] MIPS: cavium-octeon: " Pengpeng Hou
2026-04-04 14:06 ` [PATCH 5/8] MIPS: arc: bound firmware command-line construction Pengpeng Hou
2026-04-04 14:06 ` [PATCH 8/8] MIPS: malta-setup: bound pci_clock command-line append Pengpeng Hou
2026-04-04 14:06 ` [PATCH 4/8] MIPS: txx9: bound command-line reconstruction Pengpeng Hou

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=20260405102003.3-mips-cmdline-pengpeng@iscas.ac.cn \
    --to=pengpeng@iscas.ac.cn \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=macro@orcam.me.uk \
    --cc=tsbogend@alpha.franken.de \
    /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

all inboxes | Powered by JetHome®