Commit 89cbec71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.uaccess-unaligned' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull uacess-unaligned removal from Al Viro:
 "That stuff had just one user, and an exotic one, at that - binfmt_flat
  on arm and m68k"

* 'work.uaccess-unaligned' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  kill {__,}{get,put}_user_unaligned()
  binfmt_flat: flat_{get,put}_addr_from_rp() should be able to fail
parents 2173bd06 3170d8d2

arch/arm/include/asm/flat.h

+22 −3
Original line number Diff line number Diff line
@@ -5,12 +5,31 @@ 
#ifndef __ARM_FLAT_H__

#define __ARM_FLAT_H__



#include <linux/uaccess.h>



#define	flat_argvp_envp_on_stack()		1

#define	flat_old_ram_flag(flags)		(flags)

#define	flat_reloc_valid(reloc, size)		((reloc) <= (size))

#define	flat_get_addr_from_rp(rp, relval, flags, persistent) \

	({ unsigned long __val; __get_user_unaligned(__val, rp); __val; })

#define	flat_put_addr_at_rp(rp, val, relval)	__put_user_unaligned(val, rp)



static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,

					u32 *addr, u32 *persistent)

{

#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS

	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)

{

#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS

	return copy_to_user(rp, &addr, 4) ? -EFAULT : 0;

#else

	return put_user(addr, rp);

#endif

}



#define	flat_get_relocate_addr(rel)		(rel)

#define	flat_set_persistent(relval, p)		0

arch/arm/include/asm/uaccess.h

+0 −7
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ 
#include <asm/unified.h>

#include <asm/compiler.h>



#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS

#include <asm-generic/uaccess-unaligned.h>

#else

#define __get_user_unaligned __get_user

#define __put_user_unaligned __put_user

#endif



#include <asm/extable.h>



/*

arch/arm64/include/asm/uaccess.h

+0 −4
Original line number Diff line number Diff line
@@ -254,8 +254,6 @@ do { \ 
	(void)0;							\

})



#define __get_user_unaligned __get_user



#define get_user(x, ptr)						\

({									\

	__typeof__(*(ptr)) __user *__p = (ptr);				\
@@ -320,8 +318,6 @@ do { \ 
	(void)0;							\

})



#define __put_user_unaligned __put_user



#define put_user(x, ptr)						\

({									\

	__typeof__(*(ptr)) __user *__p = (ptr);				\

arch/blackfin/include/asm/flat.h

+15 −10
Original line number Diff line number Diff line
@@ -14,23 +14,28 @@ 
#define	flat_argvp_envp_on_stack()		0

#define	flat_old_ram_flag(flags)		(flags)



extern unsigned long bfin_get_addr_from_rp (unsigned long *ptr,

					unsigned long relval,

					unsigned long flags,

					unsigned long *persistent);

extern unsigned long bfin_get_addr_from_rp (u32 *ptr, u32 relval,

					u32 flags, u32 *persistent);



extern void bfin_put_addr_at_rp(unsigned long *ptr, unsigned long addr,

		                unsigned long relval);

extern void bfin_put_addr_at_rp(u32 *ptr, u32 addr, u32 relval);



/* The amount by which a relocation can exceed the program image limits

   without being regarded as an error.  */



#define	flat_reloc_valid(reloc, size)	((reloc) <= (size))



#define	flat_get_addr_from_rp(rp, relval, flags, persistent)	\

	bfin_get_addr_from_rp(rp, relval, flags, persistent)

#define	flat_put_addr_at_rp(rp, val, relval)	\

	bfin_put_addr_at_rp(rp, val, relval)

static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,

					u32 *addr, u32 *persistent)

{

	*addr = bfin_get_addr_from_rp(rp, relval, flags, persistent);

	return 0;

}



static inline int flat_put_addr_at_rp(u32 __user *rp, u32 val, u32 relval)

{

	bfin_put_addr_at_rp(rp, val, relval);

	return 0;

}



/* Convert a relocation entry into an address.  */

static inline unsigned long

arch/blackfin/kernel/flat.c

+6 −7
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ 
#define FLAT_BFIN_RELOC_TYPE_16H_BIT 1

#define FLAT_BFIN_RELOC_TYPE_32_BIT 2



unsigned long bfin_get_addr_from_rp(unsigned long *ptr,

		unsigned long relval,

		unsigned long flags,

		unsigned long *persistent)

unsigned long bfin_get_addr_from_rp(u32 *ptr,

		u32 relval,

		u32 flags,

		u32 *persistent)

{

	unsigned short *usptr = (unsigned short *)ptr;

	int type = (relval >> 26) & 7;

	unsigned long val;

	u32 val;



	switch (type) {

	case FLAT_BFIN_RELOC_TYPE_16_BIT:
@@ -59,8 +59,7 @@ EXPORT_SYMBOL(bfin_get_addr_from_rp); 
 * Insert the address ADDR into the symbol reference at RP;

 * RELVAL is the raw relocation-table entry from which RP is derived

 */

void bfin_put_addr_at_rp(unsigned long *ptr, unsigned long addr,

		unsigned long relval)

void bfin_put_addr_at_rp(u32 *ptr, u32 addr, u32 relval)

{

	unsigned short *usptr = (unsigned short *)ptr;

	int type = (relval >> 26) & 7;

CRA Git | Maintained and supported by SUSTech CRA and CCSE