From: Nicolas Pitre <nicolas.pitre@linaro.org>
To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
David Howells <dhowells@redhat.com>,
Greg Ungerer <gerg@linux-m68k.org>
Subject: [PATCH v4 05/12] binfmt_flat: use generic transfer_args_to_stack()
Date: Wed, 20 Jul 2016 15:22:34 -0400 [thread overview]
Message-ID: <1469042561-7360-6-git-send-email-nicolas.pitre@linaro.org> (raw)
In-Reply-To: <1469042561-7360-1-git-send-email-nicolas.pitre@linaro.org>
This gets rid of the rather ugly, open coded and suboptimal copy code.
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Reviewed-by: Greg Ungerer <gerg@linux-m68k.org>
---
fs/binfmt_flat.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 03301bad1f..a002e1a3b9 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -846,10 +846,8 @@ static int load_flat_binary(struct linux_binprm *bprm)
{
struct lib_info libinfo;
struct pt_regs *regs = current_pt_regs();
- unsigned long p = bprm->p;
- unsigned long stack_len;
+ unsigned long sp, stack_len;
unsigned long start_addr;
- unsigned long *sp;
int res;
int i, j;
@@ -884,15 +882,15 @@ static int load_flat_binary(struct linux_binprm *bprm)
set_binfmt(&flat_format);
- p = ((current->mm->context.end_brk + stack_len + 3) & ~3) - 4;
- pr_debug("p=%lx\n", p);
+ sp = ((current->mm->context.end_brk + stack_len + 3) & ~3) - 4;
+ pr_debug("sp=%lx\n", sp);
- /* copy the arg pages onto the stack, this could be more efficient :-) */
- for (i = TOP_OF_ARGS - 1; i >= bprm->p; i--)
- *(char *) --p =
- ((char *) page_address(bprm->page[i/PAGE_SIZE]))[i % PAGE_SIZE];
+ /* copy the arg pages onto the stack */
+ res = transfer_args_to_stack(bprm, &sp);
+ if (res)
+ return res;
- sp = (unsigned long *) create_flat_tables(p, bprm);
+ sp = create_flat_tables(sp, bprm);
/* Fake some return addresses to ensure the call chain will
* initialise library in order for us. We are required to call
@@ -904,14 +902,14 @@ static int load_flat_binary(struct linux_binprm *bprm)
for (i = MAX_SHARED_LIBS-1; i > 0; i--) {
if (libinfo.lib_list[i].loaded) {
/* Push previos first to call address */
- --sp; put_user(start_addr, sp);
+ --sp; put_user(start_addr, (unsigned long *)sp);
start_addr = libinfo.lib_list[i].entry;
}
}
#endif
/* Stash our initial stack pointer into the mm structure */
- current->mm->start_stack = (unsigned long)sp;
+ current->mm->start_stack = sp;
#ifdef FLAT_PLAT_INIT
FLAT_PLAT_INIT(regs);
--
2.7.4
next prev parent reply other threads:[~2016-07-20 19:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-20 19:22 [PATCH v4 00/12] allow BFLT executables on systems with a MMU Nicolas Pitre
2016-07-20 19:22 ` [PATCH v4 01/12] binfmt_flat: assorted cleanups Nicolas Pitre
2016-07-20 19:22 ` [PATCH v4 02/12] binfmt_flat: convert printk invocations to their modern form Nicolas Pitre
2016-07-20 19:22 ` [PATCH v4 03/12] binfmt_flat: prevent kernel dammage from corrupted executable headers Nicolas Pitre
2016-07-20 19:22 ` [PATCH v4 04/12] elf_fdpic_transfer_args_to_stack(): make it generic Nicolas Pitre
2016-07-20 19:22 ` Nicolas Pitre [this message]
2016-07-20 19:22 ` [PATCH v4 06/12] binfmt_flat: clean up create_flat_tables() and stack accesses Nicolas Pitre
2016-07-20 19:22 ` [PATCH v4 07/12] binfmt_flat: use proper user space accessors with relocs processing code Nicolas Pitre
2016-07-20 19:22 ` [PATCH v4 08/12] binfmt_flat: use proper user space accessors with old relocs code Nicolas Pitre
2016-07-20 19:22 ` [PATCH v4 09/12] binfmt_flat: use clear_user() rather than memset() to clear .bss Nicolas Pitre
2016-07-20 19:22 ` [PATCH v4 10/12] binfmt_flat: update libraries' data segment pointer with userspace accessors Nicolas Pitre
2016-07-20 19:22 ` [PATCH v4 11/12] binfmt_flat: add MMU-specific support Nicolas Pitre
2016-07-20 19:22 ` [PATCH v4 12/12] binfmt_flat: allow compressed flat binary format to work on MMU systems Nicolas Pitre
2016-07-21 6:58 ` [PATCH v4 00/12] allow BFLT executables on systems with a MMU Greg Ungerer
2016-07-21 14:48 ` Nicolas Pitre
2016-07-22 7:28 ` Greg Ungerer
2016-07-22 15:06 ` One Thousand Gnomes
2016-07-22 19:22 ` Russell King - ARM Linux
2016-07-22 19:45 ` Nicolas Pitre
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=1469042561-7360-6-git-send-email-nicolas.pitre@linaro.org \
--to=nicolas.pitre@linaro.org \
--cc=dhowells@redhat.com \
--cc=gerg@linux-m68k.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).