From patchwork Sun Jul 24 15:30:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 9244975 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BA57B607FD for ; Sun, 24 Jul 2016 15:34:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB07A2521F for ; Sun, 24 Jul 2016 15:34:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9FF6E26224; Sun, 24 Jul 2016 15:34:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36FD32521F for ; Sun, 24 Jul 2016 15:34:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752370AbcGXPbH (ORCPT ); Sun, 24 Jul 2016 11:31:07 -0400 Received: from alt32.smtp-out.videotron.ca ([24.53.0.21]:23691 "EHLO alt32.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752178AbcGXPam (ORCPT ); Sun, 24 Jul 2016 11:30:42 -0400 Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id RLMUbZWt3WjC4RLMVb7Uts; Sun, 24 Jul 2016 11:30:39 -0400 X-Authority-Analysis: v=2.1 cv=FfyXvMK6 c=1 sm=1 tr=0 a=keA3yYpnlypCNW5BNWqu+w==:117 a=keA3yYpnlypCNW5BNWqu+w==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=cAmyUtKerLwA:10 a=KKAkSRfTAAAA:8 a=tBb2bbeoAAAA:8 a=DMl-GJ9muVejgHDmi8QA:9 a=cvBusfyB2V15izCimMoJ:22 a=Oj-tNtZlA1e06AYgeCfH:22 Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 6A31C2DA06A7; Sun, 24 Jul 2016 11:30:36 -0400 (EDT) From: Nicolas Pitre To: Greg Ungerer , linux-fsdevel@vger.kernel.org Cc: Alan Cox , Alexander Viro , David Howells , linux-arm-kernel@lists.infradead.org, linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 11/15] binfmt_flat: add MMU-specific support Date: Sun, 24 Jul 2016 11:30:25 -0400 Message-Id: <1469374229-21585-12-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469374229-21585-1-git-send-email-nicolas.pitre@linaro.org> References: <1469374229-21585-1-git-send-email-nicolas.pitre@linaro.org> X-CMAE-Envelope: MS4wfPTuk5vgEVbZxwQ/ko3zyuMXot5oiXlnL4G+PStog+3Yn4HTLk5d9pKEWoMWWz2hFQ6TSgO7YetKEZDK45h6u0hKGGueY84GrbAe/p0Y2nmpXTafMLpN r9Ft6dIn1a0Cj0WCAEIqF9muvH0IwSFk/2AWCCiRCcK95zzd3X3000u+yw/olk8ta2X2mMtiHey1GR/bQICEaHqasv8805fIIbuH89I807JNsQrgYG71GBp7 J+ybpI556ETMqncNOfhPAiIXoPh++14f9niNN194pEetN14a+104nWKYF2IOLr8Dfrki7L7ZVwN4/u9SdaoAnuIlRDu68mAYm4wuhWcL0P7myMkt/UH8h8Ix yXnjYJcJGKfq3dJWIc8ZEXCBgZEZ+QhfCRMARbSHeg3ay5mVylzpa8MLs8fvoM7Dk7fZ0ksAROT4YncT54dVEXfXcHFteHdZEr75f5BzS65jsuNqgAA= Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Not much else to do at this point except for the different stack setups. Signed-off-by: Nicolas Pitre Reviewed-by: Greg Ungerer --- fs/binfmt_flat.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index aa7971ce6a..7b999aebad 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -537,7 +537,7 @@ static int load_flat_file(struct linux_binprm *bprm, * case, and then the fully copied to RAM case which lumps * it all together. */ - if ((flags & (FLAT_FLAG_RAM|FLAT_FLAG_GZIP)) == 0) { + if (!IS_ENABLED(CONFIG_MMU) && !(flags & (FLAT_FLAG_RAM|FLAT_FLAG_GZIP))) { /* * this should give us a ROM ptr, but if it doesn't we don't * really care @@ -677,7 +677,9 @@ static int load_flat_file(struct linux_binprm *bprm, */ current->mm->start_brk = datapos + data_len + bss_len; current->mm->brk = (current->mm->start_brk + 3) & ~3; +#ifndef CONFIG_MMU current->mm->context.end_brk = memp + memp_size - stack_len; +#endif } if (flags & FLAT_FLAG_KTRACE) { @@ -870,7 +872,7 @@ static int load_flat_binary(struct linux_binprm *bprm) { struct lib_info libinfo; struct pt_regs *regs = current_pt_regs(); - unsigned long stack_len; + unsigned long stack_len = 0; unsigned long start_addr; int res; int i, j; @@ -884,7 +886,9 @@ static int load_flat_binary(struct linux_binprm *bprm) * pedantic and include space for the argv/envp array as it may have * a lot of entries. */ - stack_len = PAGE_SIZE * MAX_ARG_PAGES - bprm->p; /* the strings */ +#ifndef CONFIG_MMU + stack_len += PAGE_SIZE * MAX_ARG_PAGES - bprm->p; /* the strings */ +#endif stack_len += (bprm->argc + 1) * sizeof(char *); /* the argv array */ stack_len += (bprm->envc + 1) * sizeof(char *); /* the envp array */ stack_len = ALIGN(stack_len, FLAT_STACK_ALIGN); @@ -912,6 +916,11 @@ static int load_flat_binary(struct linux_binprm *bprm) set_binfmt(&flat_format); +#ifdef CONFIG_MMU + res = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT); + if (!res) + res = create_flat_tables(bprm, bprm->p); +#else /* Stash our initial stack pointer into the mm structure */ current->mm->start_stack = ((current->mm->context.end_brk + stack_len + 3) & ~3) - 4; @@ -921,6 +930,7 @@ static int load_flat_binary(struct linux_binprm *bprm) res = transfer_args_to_stack(bprm, ¤t->mm->start_stack); if (!res) res = create_flat_tables(bprm, current->mm->start_stack); +#endif if (res) return res;