From patchwork Mon Jul 18 03:31:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 9234017 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 000FA6089D for ; Mon, 18 Jul 2016 03:47:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E79A426A4D for ; Mon, 18 Jul 2016 03:47:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC61F26AE3; Mon, 18 Jul 2016 03:47:30 +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 3A43426A99 for ; Mon, 18 Jul 2016 03:47:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751400AbcGRDr1 (ORCPT ); Sun, 17 Jul 2016 23:47:27 -0400 Received: from alt32.smtp-out.videotron.ca ([24.53.0.21]:20196 "EHLO alt32.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751451AbcGRDrN (ORCPT ); Sun, 17 Jul 2016 23:47:13 -0400 Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id OzHubJh5bYOXTOzHvb8QfO; Sun, 17 Jul 2016 23:32:11 -0400 X-Authority-Analysis: v=2.1 cv=Gfm35VjL 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=4-o70nTs-70vGUyL8pgA:9 a=cvBusfyB2V15izCimMoJ:22 Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id D9B782DA0695; Sun, 17 Jul 2016 23:32:08 -0400 (EDT) From: Nicolas Pitre To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Alexander Viro , David Howells , Greg Ungerer Subject: [PATCH v2 09/10] binfmt_flat: add MMU-specific support Date: Sun, 17 Jul 2016 23:31:55 -0400 Message-Id: <1468812716-30537-10-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468812716-30537-1-git-send-email-nicolas.pitre@linaro.org> References: <1468812716-30537-1-git-send-email-nicolas.pitre@linaro.org> X-CMAE-Envelope: MS4wfNOVVS1WVRUbKNSOTJGU3bHyUQgjhy9ngH1NO7FYgta/duCAyc7QTUVeujAdXOb/sAspvsDL3SHQp+wl/Y/D2RSHw7zeGMgCLrV/fNo43ieHkXggwiHF gCDCFyj+D8TqJwMQH42sKjudmcDZHdM0zMTVx1P96NVn7t6GmggwTjwqu81H96NL3yvbIM+pcn/FJ/UOUhV5e4fhb+s7XvWSCsLAp4RdUDAbI/sNbF5qEvET /7LOhb3+pOP2WxU08zdBwhr6lBvlcYZgvq7nkWE5GIVRvZF9BbkKJxU1i9jCgFyyfcIaViCSzteeMFI0zZlvQw== 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. SuperH and Xtensa could be added to the allowed list if they implement __put_user_unaligned() and __get_user_unaligned(). Signed-off-by: Nicolas Pitre --- fs/Kconfig.binfmt | 3 ++- fs/binfmt_flat.c | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index 72c03354c1..4c09d93d95 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -89,7 +89,8 @@ config BINFMT_SCRIPT config BINFMT_FLAT bool "Kernel support for flat binaries" - depends on !MMU && (!FRV || BROKEN) + depends on !MMU || ARM || M68K + depends on !FRV || BROKEN help Support uClinux FLAT format binaries. diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index 3221ed9d7c..4cb0c4b6ae 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -546,7 +546,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 @@ -687,7 +687,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) { @@ -878,7 +880,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; @@ -892,7 +894,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); @@ -920,6 +924,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; @@ -929,6 +938,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;