lkml.org 
[lkml]   [2019]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/15] binfmt_flat: replace flat_argvp_envp_on_stack with a Kconfig variable
    Date
    This will eventually allow us to kill the need for an <asm/flat.h> for
    many cases.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    arch/arm/Kconfig | 1 +
    arch/arm/include/asm/flat.h | 2 --
    arch/c6x/include/asm/flat.h | 1 -
    arch/h8300/Kconfig | 1 +
    arch/h8300/include/asm/flat.h | 2 --
    arch/m68k/Kconfig | 1 +
    arch/m68k/include/asm/flat.h | 1 -
    arch/microblaze/include/asm/flat.h | 2 --
    arch/sh/include/asm/flat.h | 1 -
    arch/xtensa/include/asm/flat.h | 1 -
    fs/Kconfig.binfmt | 3 +++
    fs/binfmt_flat.c | 5 +++--
    12 files changed, 9 insertions(+), 12 deletions(-)

    diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
    index 8869742a85df..b1b48c0bde76 100644
    --- a/arch/arm/Kconfig
    +++ b/arch/arm/Kconfig
    @@ -30,6 +30,7 @@ config ARM
    select ARCH_USE_BUILTIN_BSWAP
    select ARCH_USE_CMPXCHG_LOCKREF
    select ARCH_WANT_IPC_PARSE_VERSION
    + select BINFMT_FLAT_ARGVP_ENVP_ON_STACK
    select BUILDTIME_EXTABLE_SORT if MMU
    select CLONE_BACKWARDS
    select CPU_PM if SUSPEND || CPU_IDLE
    diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h
    index acf162111ee2..bbc27901446f 100644
    --- a/arch/arm/include/asm/flat.h
    +++ b/arch/arm/include/asm/flat.h
    @@ -8,8 +8,6 @@

    #include <linux/uaccess.h>

    -#define flat_argvp_envp_on_stack() 1
    -
    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 353e4d06e8c0..2d57a9204d21 100644
    --- a/arch/c6x/include/asm/flat.h
    +++ b/arch/c6x/include/asm/flat.h
    @@ -4,7 +4,6 @@

    #include <asm/unaligned.h>

    -#define flat_argvp_envp_on_stack() 0
    static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
    u32 *addr, u32 *persistent)
    {
    diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
    index d30e8727b02d..7457f190caaa 100644
    --- a/arch/h8300/Kconfig
    +++ b/arch/h8300/Kconfig
    @@ -2,6 +2,7 @@
    config H8300
    def_bool y
    select ARCH_32BIT_OFF_T
    + select BINFMT_FLAT_ARGVP_ENVP_ON_STACK
    select BINFMT_FLAT_OLD_ALWAYS_RAM
    select GENERIC_ATOMIC64
    select HAVE_UID16
    diff --git a/arch/h8300/include/asm/flat.h b/arch/h8300/include/asm/flat.h
    index 14cc928d5478..4683146f0e9e 100644
    --- a/arch/h8300/include/asm/flat.h
    +++ b/arch/h8300/include/asm/flat.h
    @@ -8,8 +8,6 @@

    #include <asm/unaligned.h>

    -#define flat_argvp_envp_on_stack() 1
    -
    /*
    * on the H8 a couple of the relocations have an instruction in the
    * top byte. As there can only be 24bits of address space, we just
    diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
    index 218e037ef901..fd69ee5ad6ab 100644
    --- a/arch/m68k/Kconfig
    +++ b/arch/m68k/Kconfig
    @@ -7,6 +7,7 @@ config M68K
    select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
    select ARCH_NO_COHERENT_DMA_MMAP if !MMU
    select ARCH_NO_PREEMPT if !COLDFIRE
    + select BINFMT_FLAT_ARGVP_ENVP_ON_STACK
    select HAVE_IDE
    select HAVE_AOUT if MMU
    select HAVE_DEBUG_BUGVERBOSE
    diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h
    index 7b1fb5c2809e..d7102fcd43eb 100644
    --- a/arch/m68k/include/asm/flat.h
    +++ b/arch/m68k/include/asm/flat.h
    @@ -8,7 +8,6 @@

    #include <linux/uaccess.h>

    -#define flat_argvp_envp_on_stack() 1
    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 1cd8d7f4cf12..9e3d8e01d294 100644
    --- a/arch/microblaze/include/asm/flat.h
    +++ b/arch/microblaze/include/asm/flat.h
    @@ -13,8 +13,6 @@

    #include <asm/unaligned.h>

    -#define flat_argvp_envp_on_stack() 0
    -
    /*
    * Microblaze works a little differently from other arches, because
    * of the MICROBLAZE_64 reloc type. Here, a 32 bit address is split
    diff --git a/arch/sh/include/asm/flat.h b/arch/sh/include/asm/flat.h
    index 015678d7b771..1002343dd84a 100644
    --- a/arch/sh/include/asm/flat.h
    +++ b/arch/sh/include/asm/flat.h
    @@ -11,7 +11,6 @@

    #include <asm/unaligned.h>

    -#define flat_argvp_envp_on_stack() 0
    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 b215c1e66958..3d357371b28b 100644
    --- a/arch/xtensa/include/asm/flat.h
    +++ b/arch/xtensa/include/asm/flat.h
    @@ -4,7 +4,6 @@

    #include <asm/unaligned.h>

    -#define flat_argvp_envp_on_stack() 0
    static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
    u32 *addr, u32 *persistent)
    {
    diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
    index 5658e12ad944..82f7d7f234f3 100644
    --- a/fs/Kconfig.binfmt
    +++ b/fs/Kconfig.binfmt
    @@ -97,6 +97,9 @@ config BINFMT_FLAT
    help
    Support uClinux FLAT format binaries.

    +config BINFMT_FLAT_ARGVP_ENVP_ON_STACK
    + bool
    +
    config BINFMT_FLAT_OLD_ALWAYS_RAM
    bool

    diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
    index 18d82fd5f57c..c09651087eda 100644
    --- a/fs/binfmt_flat.c
    +++ b/fs/binfmt_flat.c
    @@ -124,14 +124,15 @@ static int create_flat_tables(struct linux_binprm *bprm, unsigned long arg_start

    sp -= bprm->envc + 1;
    sp -= bprm->argc + 1;
    - sp -= flat_argvp_envp_on_stack() ? 2 : 0;
    + if (IS_ENABLED(CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK))
    + sp -= 2; /* argvp + envp */
    sp -= 1; /* &argc */

    current->mm->start_stack = (unsigned long)sp & -FLAT_STACK_ALIGN;
    sp = (unsigned long __user *)current->mm->start_stack;

    __put_user(bprm->argc, sp++);
    - if (flat_argvp_envp_on_stack()) {
    + if (IS_ENABLED(CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK)) {
    unsigned long argv, envp;
    argv = (unsigned long)(sp + 2);
    envp = (unsigned long)(sp + 2 + bprm->argc + 1);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-06-10 23:20    [W:3.460 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site