]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
authorLuis Araneda <luaraneda@gmail.com>
Thu, 8 Aug 2019 12:52:43 +0000 (08:52 -0400)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 10 Dec 2019 18:01:12 +0000 (18:01 +0000)
commit b7005d4ef4f3aa2dc24019ffba03a322557ac43d upstream.

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>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/arm/mach-zynq/platsmp.c

index abc82ef085c1617011fa3174bfaea2b7d8cb6244..5ebcbee0ff7df3e8db44c6992b470aa18b999ff6 100644 (file)
@@ -65,7 +65,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);