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

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

arch/arm/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ generic-y += early_ioremap.h 
generic-y += emergency-restart.h

generic-y += exec.h

generic-y += extable.h

generic-y += flat.h

generic-y += irq_regs.h

generic-y += kdebug.h

generic-y += local.h

arch/m68k/include/asm/flat.h

+1 −20
Original line number Diff line number Diff line
@@ -6,26 +6,7 @@ 
#ifndef __M68KNOMMU_FLAT_H__

#define __M68KNOMMU_FLAT_H__



#include <linux/uaccess.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

}

#include <asm-generic/flat.h>



#define FLAT_PLAT_INIT(regs) \

	do { \

arch/arm/include/asm/flat.h→include/asm-generic/flat.h

+4 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * arch/arm/include/asm/flat.h -- uClinux flat-format executables

 */



#ifndef __ARM_FLAT_H__

#define __ARM_FLAT_H__

#ifndef _ASM_GENERIC_FLAT_H

#define _ASM_GENERIC_FLAT_H



#include <linux/uaccess.h>
@@ -27,4 +23,4 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel) 
#endif

}



#endif /* __ARM_FLAT_H__ */
 
#endif /* _ASM_GENERIC_FLAT_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE