Commit 7a8998c9 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Ungerer

binfmt_flat: provide an asm-generic/flat.h

This file implements the flat get/put reloc helpers for architectures
that do not need to overload the relocs by simply using get_user/put_user.

Note that many nommu architectures currently use {get,put}_unaligned, which
looks a little bogus and should probably later be switched over to this
version as well.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
parent cf9a566c
...@@ -5,6 +5,7 @@ generic-y += early_ioremap.h ...@@ -5,6 +5,7 @@ generic-y += early_ioremap.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += exec.h generic-y += exec.h
generic-y += extable.h generic-y += extable.h
generic-y += flat.h
generic-y += irq_regs.h generic-y += irq_regs.h
generic-y += kdebug.h generic-y += kdebug.h
generic-y += local.h generic-y += local.h
......
...@@ -6,26 +6,7 @@ ...@@ -6,26 +6,7 @@
#ifndef __M68KNOMMU_FLAT_H__ #ifndef __M68KNOMMU_FLAT_H__
#define __M68KNOMMU_FLAT_H__ #define __M68KNOMMU_FLAT_H__
#include <linux/uaccess.h> #include <asm-generic/flat.h>
static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
u32 *addr, u32 *persistent)
{
#ifdef CONFIG_CPU_HAS_NO_UNALIGNED
return copy_from_user(addr, rp, 4) ? -EFAULT : 0;
#else
return get_user(*addr, rp);
#endif
}
static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
{
#ifdef CONFIG_CPU_HAS_NO_UNALIGNED
return copy_to_user(rp, &addr, 4) ? -EFAULT : 0;
#else
return put_user(addr, rp);
#endif
}
#define FLAT_PLAT_INIT(regs) \ #define FLAT_PLAT_INIT(regs) \
do { \ do { \
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* #ifndef _ASM_GENERIC_FLAT_H
* arch/arm/include/asm/flat.h -- uClinux flat-format executables #define _ASM_GENERIC_FLAT_H
*/
#ifndef __ARM_FLAT_H__
#define __ARM_FLAT_H__
#include <linux/uaccess.h> #include <linux/uaccess.h>
static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
u32 *addr, u32 *persistent) u32 *addr, u32 *persistent)
{ {
#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
return copy_from_user(addr, rp, 4) ? -EFAULT : 0; return copy_from_user(addr, rp, 4) ? -EFAULT : 0;
...@@ -27,4 +23,4 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel) ...@@ -27,4 +23,4 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
#endif #endif
} }
#endif /* __ARM_FLAT_H__ */ #endif /* _ASM_GENERIC_FLAT_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment