From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 482F8C369D6 for ; Tue, 22 Apr 2025 02:43:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hL5v2H1wUtviVkjtP2KZFJ1X/cSMxuCwzwoU6dKcecg=; b=dzPV4iPrC5E7dr DLAf+YDSP9nf8fxvz2fkr56haa42raCj3OiAQCh6hUspiFje4uUkNaY6Z5gzksLqPmc81UcBLmFg4 I2k/L4+4J6vnKZJWIejtF4mscR60jZ+HgZVNf5heUshypu05d0gJdwIB0q9cw/SaxBedcJDNVwlUw 22PXlbeSiFTHAJNYiSlcIS1rb52Qwt1ATmxB63MqByW3vBpDOPlUDUsa171jd8Vk5hPdGVU6ilwCK /XLbIwiuzuo4eWSimsldrLKP9zR837+gyBi4z7cHkIejoDCwWYGxS2eO9+8Y9+QT3xOiXQ4iA0EsK QzDBnUh67R3AA+ydeDYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u73bc-00000005fkW-40iL; Tue, 22 Apr 2025 02:43:28 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u73Dt-00000005ZsD-2CeD for linux-riscv@lists.infradead.org; Tue, 22 Apr 2025 02:18:59 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id BB99FA4BF4B; Tue, 22 Apr 2025 02:13:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A8A0C4CEE4; Tue, 22 Apr 2025 02:18:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745288336; bh=S54uJCGVVcNRF4SVztCd2+ZnQpRSE0JDXKatsL4OMKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tXmXpuf5VQWwxaYGYzXWFbcdMtBKhcd+0u9jGT8/b7mqKgPdrwiGpPCMiOLlOs8ci dSZMFNVOabd7BCMsE/v2Bm4kYyIgCVLeheg9z3Qy07QQbFIVq8bNXrvACkPR5FkJHv ZjvglmVGJst7zvZswD2Q8xAsgRLGJ+L94mIuoKhMl2bkPiomKZF6Wv5A0fPalEMdp3 H00A4/lBq9u7JfmNKlWyHHo0H037mWc8bHog8ZLlLber0LMpC3E/s/NBBrwEI/KNYt jen/oUjO69j60qXWoyvJ5CzXhsY2vGUQ9Sy47wJDXtwUqKhgKs4TM0ebtyt1Ck9Hci GclHTtLI8zxfA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nathan Chancellor , Alexandre Ghiti , "Dmitry V . Levin" , Sasha Levin , paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 6/6] riscv: Avoid fortify warning in syscall_get_arguments() Date: Mon, 21 Apr 2025 22:18:46 -0400 Message-Id: <20250422021846.1941972-6-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250422021846.1941972-1-sashal@kernel.org> References: <20250422021846.1941972-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250421_191857_699865_C81818BF X-CRM114-Status: GOOD ( 13.30 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Nathan Chancellor [ Upstream commit 1413708f990cb7d025affd706ba9c23e2bfc1a27 ] When building with CONFIG_FORTIFY_SOURCE=y and W=1, there is a warning because of the memcpy() in syscall_get_arguments(): In file included from include/linux/string.h:392, from include/linux/bitmap.h:13, from include/linux/cpumask.h:12, from arch/riscv/include/asm/processor.h:55, from include/linux/sched.h:13, from kernel/ptrace.c:13: In function 'fortify_memcpy_chk', inlined from 'syscall_get_arguments.isra' at arch/riscv/include/asm/syscall.h:66:2: include/linux/fortify-string.h:580:25: error: call to '__read_overflow2_field' declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Werror=attribute-warning] 580 | __read_overflow2_field(q_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors The fortified memcpy() routine enforces that the source is not overread and the destination is not overwritten if the size of either field and the size of the copy are known at compile time. The memcpy() in syscall_get_arguments() intentionally overreads from a1 to a5 in 'struct pt_regs' but this is bigger than the size of a1. Normally, this could be solved by wrapping a1 through a5 with struct_group() but there was already a struct_group() applied to these members in commit bba547810c66 ("riscv: tracing: Fix __write_overflow_field in ftrace_partial_regs()"). Just avoid memcpy() altogether and write the copying of args from regs manually, which clears up the warning at the expense of three extra lines of code. Signed-off-by: Nathan Chancellor Reviewed-by: Alexandre Ghiti Reviewed-by: Dmitry V. Levin Link: https://lore.kernel.org/r/20250409-riscv-avoid-fortify-warning-syscall_get_arguments-v1-1-7853436d4755@kernel.org Signed-off-by: Alexandre Ghiti Signed-off-by: Sasha Levin --- arch/riscv/include/asm/syscall.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/syscall.h b/arch/riscv/include/asm/syscall.h index 34fbb3ea21d5b..932ec2500b8ae 100644 --- a/arch/riscv/include/asm/syscall.h +++ b/arch/riscv/include/asm/syscall.h @@ -60,8 +60,11 @@ static inline void syscall_get_arguments(struct task_struct *task, unsigned long *args) { args[0] = regs->orig_a0; - args++; - memcpy(args, ®s->a1, 5 * sizeof(args[0])); + args[1] = regs->a1; + args[2] = regs->a2; + args[3] = regs->a3; + args[4] = regs->a4; + args[5] = regs->a5; } static inline void syscall_set_arguments(struct task_struct *task, -- 2.39.5 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv