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 1B5BBC433F5 for ; Fri, 19 Nov 2021 13:39:02 +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 DC26C61A53 for ; Fri, 19 Nov 2021 13:39:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DC26C61A53 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.de 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-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/cYmygh0++PBi5/WgT9k/hYLzBasnD9FDMWX8DGkJnY=; b=J6goTzQqV20VwK NC9IkQpGPj5AjNzkIKVQ2GUrssyqA3s0dMDLAK0hSZNu8l7NjOGB9vYumS4BiU8B7nrx+zYKpOGeV dshAT8hhqfEq9o9/amQ5E+CX0Y5+LQXuRUyZ1e41qmKoKD2OXJ6yoAlXbJu/WS5uTK4rHj6WdPrJi cUEFV+ZXHakq/qUY9J1PoJRBB202nxEXgZc2YcGwpv6T+1b9bB7icxRrXxs3mY4rcIpVWjFssjwMb /ZUNmjN+cGeasfBl2/iu4/2YQ6tmrKEZk8mRKykXHGSKeMVJ4J9Mjfea5Y204cDd9g3RZiN/EYc4W QjkOrTTRcbnYHAVtHgnA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mo458-00AX1x-1n; Fri, 19 Nov 2021 13:37:34 +0000 Received: from smtp-out2.suse.de ([195.135.220.29]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mo452-00AWzc-Kj for linux-arm-kernel@lists.infradead.org; Fri, 19 Nov 2021 13:37:30 +0000 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id DE7441FD3C; Fri, 19 Nov 2021 13:37:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1637329044; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=j8acmjTyYItyhDW19Le4TEryHiL5Ik8YXs+Eg5uTD1Y=; b=BoGtjA44TegmtJqFuURZs4KhoVvzTfKAmYTcT3R3Uyq0al9fviQgKewg+PMvAo9xczYQBM MpTxdfmcIeB753VxJFYPjhZPvX2ZLvPJLId+NcKXPV0CgKjsagCLQr7ZMCci4C5Zxr56rN 7V1nm9gf1/0UyF/ykldftJ9wlqqmmA4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1637329044; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=j8acmjTyYItyhDW19Le4TEryHiL5Ik8YXs+Eg5uTD1Y=; b=+eKvZO2KwqojJ/xcudgb0j3Ka/H1YwDtXv4sti8Jq11W4jYNqm+KCyd7we2PljyPqtWQCm nXQqrk0ngfCe2KBA== Received: from alsa1.suse.de (alsa1.suse.de [10.160.4.42]) by relay2.suse.de (Postfix) with ESMTP id D515EA3B85; Fri, 19 Nov 2021 13:37:24 +0000 (UTC) Date: Fri, 19 Nov 2021 14:37:24 +0100 Message-ID: From: Takashi Iwai To: Dinh Nguyen Cc: Takashi Iwai , Kees Cook , "Ivan T . Ivanov" , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE In-Reply-To: <91f8a48f-512d-ea18-3af9-fa444d826b23@kernel.org> References: <20211118142508.19200-1-tiwai@suse.de> <91f8a48f-512d-ea18-3af9-fa444d826b23@kernel.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211119_053728_897858_7F3030BD X-CRM114-Status: GOOD ( 27.91 ) 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 18 Nov 2021 23:08:27 +0100, Dinh Nguyen wrote: > > Hi Iwai, > > Should this have the following tag: > > Fixes: 9c4566a117a6 ("ARM: socfpga: Enable SMP for socfpga") > > As well? Yes, that'd be helpful, too. thanks, Takashi > > 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