mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
187bea4726
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: 9c4566a117 ("ARM: socfpga: Enable SMP for socfpga")
Suggested-by: Kees 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: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
130 lines
3.4 KiB
C
130 lines
3.4 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright 2010-2011 Calxeda, Inc.
|
|
* Copyright 2012 Pavel Machek <pavel@denx.de>
|
|
* Based on platsmp.c, Copyright (C) 2002 ARM Ltd.
|
|
* Copyright (C) 2012 Altera Corporation
|
|
*/
|
|
#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/io.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/smp_scu.h>
|
|
#include <asm/smp_plat.h>
|
|
|
|
#include "core.h"
|
|
|
|
static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
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);
|
|
|
|
writel(__pa_symbol(secondary_startup),
|
|
sys_manager_base_addr + (socfpga_cpu1start_addr & 0x000000ff));
|
|
|
|
flush_cache_all();
|
|
smp_wmb();
|
|
outer_clean_range(0, trampoline_size);
|
|
|
|
/* This will release CPU #1 out of reset. */
|
|
writel(0, rst_manager_base_addr + SOCFPGA_RSTMGR_MODMPURST);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int socfpga_a10_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
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);
|
|
|
|
writel(__pa_symbol(secondary_startup),
|
|
sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff));
|
|
|
|
flush_cache_all();
|
|
smp_wmb();
|
|
outer_clean_range(0, trampoline_size);
|
|
|
|
/* This will release CPU #1 out of reset. */
|
|
writel(0, rst_manager_base_addr + SOCFPGA_A10_RSTMGR_MODMPURST);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void __init socfpga_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
struct device_node *np;
|
|
void __iomem *socfpga_scu_base_addr;
|
|
|
|
np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
|
|
if (!np) {
|
|
pr_err("%s: missing scu\n", __func__);
|
|
return;
|
|
}
|
|
|
|
socfpga_scu_base_addr = of_iomap(np, 0);
|
|
if (!socfpga_scu_base_addr)
|
|
return;
|
|
scu_enable(socfpga_scu_base_addr);
|
|
}
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
/*
|
|
* platform-specific code to shutdown a CPU
|
|
*
|
|
* Called with IRQs disabled
|
|
*/
|
|
static void socfpga_cpu_die(unsigned int cpu)
|
|
{
|
|
/* Do WFI. If we wake up early, go back into WFI */
|
|
while (1)
|
|
cpu_do_idle();
|
|
}
|
|
|
|
/*
|
|
* We need a dummy function so that platform_can_cpu_hotplug() knows
|
|
* we support CPU hotplug. However, the function does not need to do
|
|
* anything, because CPUs going offline just do WFI. We could reset
|
|
* the CPUs but it would increase power consumption.
|
|
*/
|
|
static int socfpga_cpu_kill(unsigned int cpu)
|
|
{
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
static const struct smp_operations socfpga_smp_ops __initconst = {
|
|
.smp_prepare_cpus = socfpga_smp_prepare_cpus,
|
|
.smp_boot_secondary = socfpga_boot_secondary,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_die = socfpga_cpu_die,
|
|
.cpu_kill = socfpga_cpu_kill,
|
|
#endif
|
|
};
|
|
|
|
static const struct smp_operations socfpga_a10_smp_ops __initconst = {
|
|
.smp_prepare_cpus = socfpga_smp_prepare_cpus,
|
|
.smp_boot_secondary = socfpga_a10_boot_secondary,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_die = socfpga_cpu_die,
|
|
.cpu_kill = socfpga_cpu_kill,
|
|
#endif
|
|
};
|
|
|
|
CPU_METHOD_OF_DECLARE(socfpga_smp, "altr,socfpga-smp", &socfpga_smp_ops);
|
|
CPU_METHOD_OF_DECLARE(socfpga_a10_smp, "altr,socfpga-a10-smp", &socfpga_a10_smp_ops);
|