diff options
author | Luis Araneda <luaraneda@gmail.com> | 2019-08-08 08:52:43 -0400 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2019-08-14 09:40:43 +0200 |
commit | b7005d4ef4f3aa2dc24019ffba03a322557ac43d (patch) | |
tree | a21dfdfe8dc69bc4f95a0096ae82620eddb4393c | |
parent | 5f595063affa8590a03a4f3d30bb28b1560f9d49 (diff) | |
download | linux-stable-b7005d4ef4f3aa2dc24019ffba03a322557ac43d.tar.gz linux-stable-b7005d4ef4f3aa2dc24019ffba03a322557ac43d.tar.bz2 linux-stable-b7005d4ef4f3aa2dc24019ffba03a322557ac43d.zip |
ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
This fixes a kernel panic on memcpy when
FORTIFY_SOURCE is enabled.
The initial smp implementation on commit aa7eb2bb4e4a
("arm: zynq: Add smp support")
used memcpy, which worked fine until commit ee333554fed5
("ARM: 8749/1: Kconfig: Add ARCH_HAS_FORTIFY_SOURCE")
enabled overflow checks at runtime, producing a read
overflow panic.
The computed size of memcpy args are:
- p_size (dst): 4294967295 = (size_t) -1
- q_size (src): 1
- size (len): 8
Additionally, the memory is marked as __iomem, so one of
the memcpy_* functions should be used for read/write.
Fixes: aa7eb2bb4e4a ("arm: zynq: Add smp support")
Signed-off-by: Luis Araneda <luaraneda@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r-- | arch/arm/mach-zynq/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c index 38728badabd4..a10085be9073 100644 --- a/arch/arm/mach-zynq/platsmp.c +++ b/arch/arm/mach-zynq/platsmp.c @@ -57,7 +57,7 @@ int zynq_cpun_start(u32 address, int cpu) * 0x4: Jump by mov instruction * 0x8: Jumping address */ - memcpy((__force void *)zero, &zynq_secondary_trampoline, + memcpy_toio(zero, &zynq_secondary_trampoline, trampoline_size); writel(address, zero + trampoline_size); |