binfmt_flat: remove flat_reloc_valid

This helper is the same for all architectures, open code it in the only
caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Vladimir Murzin <vladimir.murzin@arm.com>
Reviewed-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>

diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h
index f0c75ddeea23762503150d10d571917608fb89aa..10cce9ecf1513b1e538086ac17ecc89e1ea6d6d2 100644 (file)
--- 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 76fd0bb962a3801c2a097767564d9caee7538d23..ecc6aea6606c533b152356b12b9474af8ff8a70d 100644 (file)
--- 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 f4cdfcbdd2baeffaf2206f4b0c8218589d37ca6b..dcc7775115dde7fb8e069c6b0a883addca6672e3 100644 (file)
--- 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 4f1d1e373420422542a4ed9d567ae46cd2c59cf6..a631caf5e18fb19467fb7fc17bf012042aa5a131 100644 (file)
--- 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 3d2747d4c9672d8a2178df115e3f75c66d88e443..34be5ed011bed241e6e31ede50f4ae265b04221b 100644 (file)
--- 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 843d458b8329fb944f18d740b53d36bdae527abd..8f2929b32f2e80b3e0d1e4c2e865e77ae9a157df 100644 (file)
--- 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 b8532d7877b38b7d6a1353b433ca7249b0621ecd..6ee5a35eb0ecd19221a8ee92470ae4dc9ed16c5f 100644 (file)
--- 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 82a48e8300181423bd589e52e673c2576c3da32d..afddea583999441e2bf5494d5d8320e589ba87fb 100644 (file)
--- 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;