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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA407C433EF for ; Thu, 18 Nov 2021 22:09:54 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9A2A06142A for ; Thu, 18 Nov 2021 22:09:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9A2A06142A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gVm8IXhj/pB0ob6EUSmTSZPbery9ab0Z/oaPTa0cHI8=; b=1ip6l+3wp/1rg8lxlgPhBpOZQf sTQtsubzeEBgrDOfV5ktWoVwqCCOk+p5v2SIiSmBmGwOLjn5jgiroQ7QjPjcte5nQdaY6TTezy3nF LteIcWcDWCETDeB/oKMd0VXJPucZtNcductgsAvkdsIVDPb1eOJ94Vrcp8vbucE8HIBX/z4dyAIX6 5hzRoPyynM9BhuytuNZV4kSDR+Wzkr640SZhVMTuPRtrR9YrS7AEXntTBhd7W3wsLI7sRZIbfMAI8 tQNeyaVBFPfqXnQM9enwhqvCHS2AshsrP9+BTkF+FrZ5XGjE8bjzE/mQ/q3WXN2cTxuNL8jeDKkC0 4KPCEYUw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mnpa5-008we9-UI; Thu, 18 Nov 2021 22:08:34 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mnpa1-008wdU-Sx for linux-arm-kernel@lists.infradead.org; Thu, 18 Nov 2021 22:08:31 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9B6E7610FC; Thu, 18 Nov 2021 22:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637273309; bh=nM7eJgtYblZpyGin8DxssN6bOnWk6deJi37e+HcLp7I=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=a2a9m1Ycwc/r8EaPgt9WTFnFBxmn2G1YStW9s96zuJVUSkS819PGpsiY08/R1ElQB j28n4E/xJCH6ezk/kaRH+mDEhdTNYI/sK71y2shhFM8Ymbsfg/gsjQZc9OdGfub8+k zrC7RLGkhIN95+YD//MMy3r6vMDH1JN4a3WsES3hpf7ZhD1DdH4JlVyo7Pb8gBVRuc XQhGeUEpkQgGAk86v+B1Cbepo1vOTTBiqLmF2ezE9A5Wet7ZHovnYwRSDDk9HsbjIF cghgyF4p1idHulmPrl+aNxv2+5MbR8Im9lJVTtE21TwPDoF2iJX0jnFdplaZZd8dqN Syf0WjKVU35LQ== Subject: Re: [PATCH v2] ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE To: Takashi Iwai Cc: Kees Cook , "Ivan T . Ivanov" , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20211118142508.19200-1-tiwai@suse.de> From: Dinh Nguyen Message-ID: <91f8a48f-512d-ea18-3af9-fa444d826b23@kernel.org> Date: Thu, 18 Nov 2021 16:08:27 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20211118142508.19200-1-tiwai@suse.de> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211118_140830_002519_601F80D3 X-CRM114-Status: GOOD ( 23.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Iwai, Should this have the following tag: Fixes: 9c4566a117a6 ("ARM: socfpga: Enable SMP for socfpga") As well? On 11/18/21 8:25 AM, Takashi Iwai wrote: > When CONFIG_FORTIFY_SOURCE is set, memcpy() checks the potential > buffer overflow and panics. The code in sofcpga bootstrapping > contains the memcpy() calls are mistakenly translated as the shorter > size, hence it triggers a panic as if it were overflowing. > > This patch changes the secondary_trampoline and *_end definitions > to arrays for avoiding the false-positive crash above. > > Suggested-by: Kees Cook > Buglink: https://bugzilla.suse.com/show_bug.cgi?id=1192473 > Link: https://lore.kernel.org/r/20211117193244.31162-1-tiwai@suse.de > Signed-off-by: Takashi Iwai > --- > > v1->v2: Use arrays for trampoline area instead of hackish workaround > with __NO_FORTIFY > > arch/arm/mach-socfpga/core.h | 2 +- > arch/arm/mach-socfpga/platsmp.c | 8 ++++---- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/mach-socfpga/core.h b/arch/arm/mach-socfpga/core.h > index fc2608b18a0d..18f01190dcfd 100644 > --- a/arch/arm/mach-socfpga/core.h > +++ b/arch/arm/mach-socfpga/core.h > @@ -33,7 +33,7 @@ extern void __iomem *sdr_ctl_base_addr; > u32 socfpga_sdram_self_refresh(u32 sdr_base); > extern unsigned int socfpga_sdram_self_refresh_sz; > > -extern char secondary_trampoline, secondary_trampoline_end; > +extern char secondary_trampoline[], secondary_trampoline_end[]; > > extern unsigned long socfpga_cpu1start_addr; > > diff --git a/arch/arm/mach-socfpga/platsmp.c b/arch/arm/mach-socfpga/platsmp.c > index fbb80b883e5d..201191cf68f3 100644 > --- a/arch/arm/mach-socfpga/platsmp.c > +++ b/arch/arm/mach-socfpga/platsmp.c > @@ -20,14 +20,14 @@ > > static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle) > { > - int trampoline_size = &secondary_trampoline_end - &secondary_trampoline; > + int trampoline_size = secondary_trampoline_end - secondary_trampoline; > > if (socfpga_cpu1start_addr) { > /* This will put CPU #1 into reset. */ > writel(RSTMGR_MPUMODRST_CPU1, > rst_manager_base_addr + SOCFPGA_RSTMGR_MODMPURST); > > - memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size); > + memcpy(phys_to_virt(0), secondary_trampoline, trampoline_size); > > writel(__pa_symbol(secondary_startup), > sys_manager_base_addr + (socfpga_cpu1start_addr & 0x000000ff)); > @@ -45,12 +45,12 @@ static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle) > > static int socfpga_a10_boot_secondary(unsigned int cpu, struct task_struct *idle) > { > - int trampoline_size = &secondary_trampoline_end - &secondary_trampoline; > + int trampoline_size = secondary_trampoline_end - secondary_trampoline; > > if (socfpga_cpu1start_addr) { > writel(RSTMGR_MPUMODRST_CPU1, rst_manager_base_addr + > SOCFPGA_A10_RSTMGR_MODMPURST); > - memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size); > + memcpy(phys_to_virt(0), secondary_trampoline, trampoline_size); > > writel(__pa_symbol(secondary_startup), > sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff)); > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel