From patchwork Wed Jul 20 19:22:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 9240311 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 D613C600CB for ; Wed, 20 Jul 2016 19:23:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C79C727C2C for ; Wed, 20 Jul 2016 19:23:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC6AA27D64; Wed, 20 Jul 2016 19:23:27 +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=ham 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 6202E27C2C for ; Wed, 20 Jul 2016 19:23:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755056AbcGTTXZ (ORCPT ); Wed, 20 Jul 2016 15:23:25 -0400 Received: from alt32.smtp-out.videotron.ca ([24.53.0.21]:12656 "EHLO alt32.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754740AbcGTTWu (ORCPT ); Wed, 20 Jul 2016 15:22:50 -0400 Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id Px4xbOBT6WjC4Px4yb1ktk; Wed, 20 Jul 2016 15:22:48 -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=CyGdA8acv9_BqvHd13oA:9 a=R1caRfGMoASQNJrA:21 a=oElwU2lJqJr46yYQ:21 a=cvBusfyB2V15izCimMoJ:22 a=Oj-tNtZlA1e06AYgeCfH:22 Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 8E54E2DA0610; Wed, 20 Jul 2016 15:22:45 -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 v4 05/12] binfmt_flat: use generic transfer_args_to_stack() Date: Wed, 20 Jul 2016 15:22:34 -0400 Message-Id: <1469042561-7360-6-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469042561-7360-1-git-send-email-nicolas.pitre@linaro.org> References: <1469042561-7360-1-git-send-email-nicolas.pitre@linaro.org> X-CMAE-Envelope: MS4wfAdB4hlIb8jsC2Cqj8OSQ1P5pySZyMK8UC5G8tWyL4L5tBtn5mqqnh0Uho5NJ/LlfOl6h4VdVNSg5DnqQWu5ofe4lqCD+218mrgXWm57QQpciwpR+kfy 2W5t2k/zh//37obuOMpPLzhjGRDYItiQbTBUJj/a0iQKd9/GxAK7dZf2Vh2DdJyNUirTr7P90uNkny5Hwq4/V9Kb7nDzUEjk2yZjPwy/zLCNnG0m4uwsVXrG sgXMPkzAeyCbcx6fC8aDsP09HZ8m/Evt9Rqb3d7sYdkCQqUtJ5+Z5nWOs+qlx3nOT7ojP41x1j2AgmcIE9uwvw== 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 This gets rid of the rather ugly, open coded and suboptimal copy code. Signed-off-by: Nicolas Pitre Reviewed-by: Greg Ungerer --- 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);