AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up

Browse Source 
This fixes a kernel panic on memcpy when
FORTIFY_SOURCE is enabled.

The initial smp implementation on commit aa7eb2bb4e
("arm: zynq: Add smp support")
used memcpy, which worked fine until commit ee333554fe
("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: aa7eb2bb4e ("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>
This commit is contained in:
Luis Araneda 2019-08-08 08:52:43 -04:00 committed by Michal Simek
parent 5f595063af
commit b7005d4ef4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-zynq/platsmp.c
View File

@ -57,7 +57,7 @@ int zynq_cpun_start(u32 address, int cpu)
* 0x4: Jump by mov instruction * 0x4: Jump by mov instruction
* 0x8: Jumping address * 0x8: Jumping address
*/ */
memcpy((__force void *)zero, &zynq_secondary_trampoline, memcpy_toio(zero, &zynq_secondary_trampoline,
trampoline_size); trampoline_size);
writel(address, zero + trampoline_size); writel(address, zero + trampoline_size);