mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc: sram-exec: Use aligned fncpy instead of memcpy

Browse Source 
Currently the sram-exec functionality, which allows allocation of
executable memory and provides an API to move code to it, is only
selected in configs for the ARM architecture. Based on commit
5756e9dd0d ("ARM: 6640/1: Thumb-2: Symbol manipulation macros for
function body copying") simply copying a C function pointer address
using memcpy without consideration of alignment and Thumb is unsafe on
ARM platforms.

The aforementioned patch introduces the fncpy macro which is a safe way
to copy executable code on ARM platforms, so let's make use of that here
rather than the unsafe plain memcpy that was previously used by
sram_exec_copy. Now sram_exec_copy will move the code to "dst" and
return an address that is guaranteed to be safely callable.

In the future, architectures hoping to make use of the sram-exec
functionality must define an fncpy macro just as ARM has done to
guarantee or check for safe copying to executable memory before allowing
the arch to select CONFIG_SRAM_EXEC.

Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dave Gerlach
2017-05-18 10:07:06 -05:00
committed by Greg Kroah-Hartman
parent a5061d0285
commit 34cfb106d1
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/sram.h
View File

@@ -16,12 +16,12 @@
struct gen_pool;
#ifdef CONFIG_SRAM_EXEC
int sram_exec_copy(struct gen_pool *pool, void *dst, void *src, size_t size);
void *sram_exec_copy(struct gen_pool *pool, void *dst, void *src, size_t size);
#else
static inline int sram_exec_copy(struct gen_pool *pool, void *dst, void *src,
size_t size)
static inline void *sram_exec_copy(struct gen_pool *pool, void *dst, void *src,
size_t size)
{
return -ENODEV;
return NULL;
}
#endif /* CONFIG_SRAM_EXEC */
#endif /* __LINUX_SRAM_H__ */