Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33712bc6 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE 



[ Upstream commit 187bea472600dcc8d2eb714335053264dd437172 ]

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.

Fixes: 9c4566a1 ("ARM: socfpga: Enable SMP for socfpga")
Suggested-by: default avatarKees Cook <keescook@chromium.org>
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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarDinh Nguyen <dinguyen@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 301cdc22

arch/arm/mach-socfpga/core.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,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;

arch/arm/mach-socfpga/platsmp.c

+4 −4
Original line number Diff line number Diff line
@@ -31,14 +31,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));
@@ -56,12 +56,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));