On 6/10/19 10:20 PM, Christoph Hellwig wrote:
> This helper is the same for all architectures, open code it in the only
> caller.
>
> Signed-off-by: Christoph Hellwig <h...@lst.de>
> ---
> arch/arm/include/asm/flat.h | 1 -
> arch/c6x/include/asm/flat.h | 1 -
> arch/h8300/include/asm/flat.h | 1 -
> arch/m68k/include/asm/flat.h | 1 -
> arch/microblaze/include/asm/flat.h | 1 -
> arch/sh/include/asm/flat.h | 1 -
> arch/xtensa/include/asm/flat.h | 1 -
> fs/binfmt_flat.c | 2 +-
> 8 files changed, 1 insertion(+), 8 deletions(-)
For ARM bits:
Tested-by: Vladimir Murzin <vladimir.mur...@arm.com>
Reviewed-by: Vladimir Murzin <vladimir.mur...@arm.com>
>
> diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h
> index f0c75ddeea23..10cce9ecf151 100644
> --- a/arch/arm/include/asm/flat.h
> +++ b/arch/arm/include/asm/flat.h
> @@ -10,7 +10,6 @@
>
> #define flat_argvp_envp_on_stack() 1
> #define flat_old_ram_flag(flags) (flags)
> -#define flat_reloc_valid(reloc, size) ((reloc) <= (size))
>
> static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32
> flags,
> u32 *addr, u32 *persistent)
> diff --git a/arch/c6x/include/asm/flat.h b/arch/c6x/include/asm/flat.h
> index 76fd0bb962a3..ecc6aea6606c 100644
> --- a/arch/c6x/include/asm/flat.h
> +++ b/arch/c6x/include/asm/flat.h
> @@ -6,7 +6,6 @@
>
> #define flat_argvp_envp_on_stack() 0
> #define flat_old_ram_flag(flags) (flags)
> -#define flat_reloc_valid(reloc, size) ((reloc) <=
> (size))
> static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32
> flags,
> u32 *addr, u32 *persistent)
> {
> diff --git a/arch/h8300/include/asm/flat.h b/arch/h8300/include/asm/flat.h
> index f4cdfcbdd2ba..dcc7775115dd 100644
> --- a/arch/h8300/include/asm/flat.h
> +++ b/arch/h8300/include/asm/flat.h
> @@ -10,7 +10,6 @@
>
> #define flat_argvp_envp_on_stack() 1
> #define flat_old_ram_flag(flags) 1
> -#define flat_reloc_valid(reloc, size) ((reloc) <= (size))
> #define flat_set_persistent(relval, p) 0
>
> /*
> diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h
> index 4f1d1e373420..a631caf5e18f 100644
> --- a/arch/m68k/include/asm/flat.h
> +++ b/arch/m68k/include/asm/flat.h
> @@ -10,7 +10,6 @@
>
> #define flat_argvp_envp_on_stack() 1
> #define flat_old_ram_flag(flags) (flags)
> -#define flat_reloc_valid(reloc, size) ((reloc) <= (size))
> static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32
> flags,
> u32 *addr, u32 *persistent)
> {
> diff --git a/arch/microblaze/include/asm/flat.h
> b/arch/microblaze/include/asm/flat.h
> index 3d2747d4c967..34be5ed011be 100644
> --- a/arch/microblaze/include/asm/flat.h
> +++ b/arch/microblaze/include/asm/flat.h
> @@ -15,7 +15,6 @@
>
> #define flat_argvp_envp_on_stack() 0
> #define flat_old_ram_flag(flags) (flags)
> -#define flat_reloc_valid(reloc, size) ((reloc) <= (size))
> #define flat_set_persistent(relval, p) 0
>
> /*
> diff --git a/arch/sh/include/asm/flat.h b/arch/sh/include/asm/flat.h
> index 843d458b8329..8f2929b32f2e 100644
> --- a/arch/sh/include/asm/flat.h
> +++ b/arch/sh/include/asm/flat.h
> @@ -13,7 +13,6 @@
>
> #define flat_argvp_envp_on_stack() 0
> #define flat_old_ram_flag(flags) (flags)
> -#define flat_reloc_valid(reloc, size) ((reloc) <= (size))
> static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32
> flags,
> u32 *addr, u32 *persistent)
> {
> diff --git a/arch/xtensa/include/asm/flat.h b/arch/xtensa/include/asm/flat.h
> index b8532d7877b3..6ee5a35eb0ec 100644
> --- a/arch/xtensa/include/asm/flat.h
> +++ b/arch/xtensa/include/asm/flat.h
> @@ -6,7 +6,6 @@
>
> #define flat_argvp_envp_on_stack() 0
> #define flat_old_ram_flag(flags) (flags)
> -#define flat_reloc_valid(reloc, size) ((reloc) <=
> (size))
> static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32
> flags,
> u32 *addr, u32 *persistent)
> {
> diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
> index 82a48e830018..afddea583999 100644
> --- a/fs/binfmt_flat.c
> +++ b/fs/binfmt_flat.c
> @@ -345,7 +345,7 @@ calc_reloc(unsigned long r, struct lib_info *p, int
> curid, int internalp)
> start_code = p->lib_list[id].start_code;
> text_len = p->lib_list[id].text_len;
>
> - if (!flat_reloc_valid(r, start_brk - start_data + text_len)) {
> + if (r > start_brk - start_data + text_len) {
> pr_err("reloc outside program 0x%lx (0 - 0x%lx/0x%lx)",
> r, start_brk-start_data+text_len, text_len);
> goto failed;
>
