From: nicolas.pitre@linaro.org (Nicolas Pitre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 15/15] ARM: enable binfmt_flat on systems with an MMU
Date: Sun, 24 Jul 2016 11:30:29 -0400 [thread overview]
Message-ID: <1469374229-21585-16-git-send-email-nicolas.pitre@linaro.org> (raw)
In-Reply-To: <1469374229-21585-1-git-send-email-nicolas.pitre@linaro.org>
Now that the generic changes are in place, this can be enabled on ARM
with the use of proper user space accessors in the flat_get_addr_from_rp()
and flat_put_addr_at_rp() handlers as rp actually holds a user space
address.
Signed-off-by: Nicolas Pitre <nico@linaro.org>
---
arch/arm/include/asm/flat.h | 5 +++--
fs/Kconfig.binfmt | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h
index e847d23351..acf1d14b89 100644
--- a/arch/arm/include/asm/flat.h
+++ b/arch/arm/include/asm/flat.h
@@ -8,8 +8,9 @@
#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) ((void)persistent,get_unaligned(rp))
-#define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp)
+#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)
#define flat_get_relocate_addr(rel) (rel)
#define flat_set_persistent(relval, p) 0
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index c7efddf6e0..4c09d93d95 100644
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -89,7 +89,7 @@ config BINFMT_SCRIPT
config BINFMT_FLAT
bool "Kernel support for flat binaries"
- depends on !MMU || M68K
+ depends on !MMU || ARM || M68K
depends on !FRV || BROKEN
help
Support uClinux FLAT format binaries.
--
2.7.4
next prev parent reply other threads:[~2016-07-24 15:30 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-24 15:30 [PATCH v5 00/15] allow BFLT executables on systems with a MMU Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 01/15] binfmt_flat: assorted cleanups Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 02/15] binfmt_flat: convert printk invocations to their modern form Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 03/15] binfmt_flat: prevent kernel dammage from corrupted executable headers Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 04/15] elf_fdpic_transfer_args_to_stack(): make it generic Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 05/15] binfmt_flat: use generic transfer_args_to_stack() Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 06/15] binfmt_flat: clean up create_flat_tables() and stack accesses Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 07/15] binfmt_flat: use proper user space accessors with relocs processing code Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 08/15] binfmt_flat: use proper user space accessors with old relocs code Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 09/15] binfmt_flat: use clear_user() rather than memset() to clear .bss Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 10/15] binfmt_flat: update libraries' data segment pointer with userspace accessors Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 11/15] binfmt_flat: add MMU-specific support Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 12/15] binfmt_flat: allow compressed flat binary format to work on MMU systems Nicolas Pitre
2016-07-24 19:48 ` Arnd Bergmann
2016-07-24 20:25 ` Nicolas Pitre
2016-07-25 8:18 ` Arnd Bergmann
2016-07-24 15:30 ` [PATCH v5 13/15] m68k: fix bFLT executable running on MMU enabled systems Nicolas Pitre
2016-07-24 15:30 ` [PATCH v5 14/15] m68k: enable binfmt_flat on systems with an MMU Nicolas Pitre
2016-07-24 15:30 ` Nicolas Pitre [this message]
2016-07-26 0:53 ` [PATCH v5 00/15] allow BFLT executables on systems with a MMU Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469374229-21585-16-git-send-email-nicolas.pitre@linaro.org \
--to=nicolas.pitre@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).