From nobody Sun Jun 14 14:30:19 2026 Received: from cstnet.cn (smtp25.cstnet.cn [159.226.251.25]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D71133542F6 for ; Fri, 3 Apr 2026 04:07:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.25 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775189238; cv=none; b=GzxZHeO1u6Al2YxcK8vymJIN39uYNiFevB68S/IKGnjW2GrCZz61TJ3M5kBdnVvIRwsKATcZ6v3f32fpnAnOHNl5hhQsM9GGLtksJpAT+fb4+hQSACb58BXMTrJ0y2ak7OuYO2nfNZO5OYGUPnumox3SFF4GZ7BeF/VjEATgSY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775189238; c=relaxed/simple; bh=oAE1JvbOB1DAnIflu1jPjW7cLqEiSv8nFrLIGXQdQWY=; h=From:Date:Message-ID:To:Cc:Subject; b=r/aWpN+bBcJ2n4Rn52F6AP8+4K5UM2qBtyDloo+52RHqaQO9YA+jD08lSc/cnjbRWtXQZabuVTf0CHjBK+dMDIT/LGAuQeiY06cQIcOAB6pGU22CJOhjU0rmWNY3CT3EX5omdJn3EOY2pPInG8G1pOpzfE6TII9Na9Db2xB6VSE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from 0003-riscv-pi.eml (unknown [111.196.245.197]) by APP-05 (Coremail) with SMTP id zQCowAAnfhHtPM9pGU1XDA--.12440S2; Fri, 03 Apr 2026 12:07:09 +0800 (CST) From: Pengpeng Hou Date: Fri, 3 Apr 2026 11:55:50 +0800 Message-ID: <20260403143003.3-riscv-pi-bootargs-pengpeng@iscas.ac.cn> To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: Alexandre Ghiti , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, pengpeng@iscas.ac.cn Subject: [PATCH] riscv: pi: validate early bootargs before string use X-CM-TRANSID: zQCowAAnfhHtPM9pGU1XDA--.12440S2 X-Coremail-Antispam: 1UD129KBjvJXoW7tFW8trWUCFyktF4rGF1rJFb_yoW8WF1xpr s8GFnavr4rZFyUt34YqanY9w48uwsxtwnFyas5uryrGa13Jry3Jw4FgrWUur1aqF48ZrW5 KF4a9a4rAFy5AaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkq14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s 0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xII jxv20xvE14v26r1Y6r17McIj6I8E87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr 1lF7xvr2IY64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxkF7I0En4kS14v26r126r1D MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr 0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0E wIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JV WxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAI cVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUjMqcUUUUUU== X-CM-SenderInfo: pshqw1xhqjqxpvfd2hldfou0/ Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" get_early_cmdline() fetches bootargs directly from the FDT and immediately passes the raw property pointer to strlen() before copying it into the early command-line buffer. Flat DT properties are external boot input, and this path does not prove that bootargs is NUL-terminated within its declared bounds. Use fdt_stringlist_get() so malformed unterminated bootargs are rejected before any C-string helpers walk them. Signed-off-by: Pengpeng Hou --- arch/riscv/kernel/pi/cmdline_early.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/riscv/kernel/pi/cmdline_early.c b/arch/riscv/kernel/pi/cm= dline_early.c index 389d086a0718..ac55f1c7ca70 100644 --- a/arch/riscv/kernel/pi/cmdline_early.c +++ b/arch/riscv/kernel/pi/cmdline_early.c @@ -13,16 +13,17 @@ static char early_cmdline[COMMAND_LINE_SIZE]; static char *get_early_cmdline(uintptr_t dtb_pa) { const char *fdt_cmdline =3D NULL; - unsigned int fdt_cmdline_size =3D 0; + int fdt_cmdline_size =3D 0; int chosen_node; =20 if (!IS_ENABLED(CONFIG_CMDLINE_FORCE)) { chosen_node =3D fdt_path_offset((void *)dtb_pa, "/chosen"); if (chosen_node >=3D 0) { - fdt_cmdline =3D fdt_getprop((void *)dtb_pa, chosen_node, - "bootargs", NULL); - if (fdt_cmdline) { - fdt_cmdline_size =3D strlen(fdt_cmdline); + fdt_cmdline =3D fdt_stringlist_get((void *)dtb_pa, + chosen_node, + "bootargs", 0, + &fdt_cmdline_size); + if (fdt_cmdline && fdt_cmdline_size > 0) { strscpy(early_cmdline, fdt_cmdline, COMMAND_LINE_SIZE); } --=20 2.50.1 (Apple Git-155)