From patchwork Tue Jul 12 21:27:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 71886 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp685042qga; Tue, 12 Jul 2016 14:45:36 -0700 (PDT) X-Received: by 10.98.64.4 with SMTP id n4mr46265489pfa.30.1468359931873; Tue, 12 Jul 2016 14:45:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hb9si3239207pac.193.2016.07.12.14.45.31; Tue, 12 Jul 2016 14:45:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbcGLVnx (ORCPT + 30 others); Tue, 12 Jul 2016 17:43:53 -0400 Received: from alt22.smtp-out.videotron.ca ([70.80.0.73]:35908 "EHLO alt22.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752050AbcGLVnu (ORCPT ); Tue, 12 Jul 2016 17:43:50 -0400 X-Greylist: delayed 903 seconds by postgrey-1.27 at vger.kernel.org; Tue, 12 Jul 2016 17:43:09 EDT Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id N5DkbZxrYzCgpN5DlbODOu; Tue, 12 Jul 2016 17:28:01 -0400 X-Authority-Analysis: v=2.1 cv=QfzGxpvv 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=CyGdA8acv9_BqvHd13oA:9 a=h-bixeDdE50t53Jr:21 a=TDkmCclVebuachYb:21 a=cvBusfyB2V15izCimMoJ:22 Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id D1AB62DA05E2; Tue, 12 Jul 2016 17:27:59 -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 03/10] binfmt_flat: use generic transfer_args_to_stack() Date: Tue, 12 Jul 2016 17:27:35 -0400 Message-Id: <1468358862-11799-4-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468358862-11799-1-git-send-email-nicolas.pitre@linaro.org> References: <1468358862-11799-1-git-send-email-nicolas.pitre@linaro.org> X-CMAE-Envelope: MS4wfHpBFbMTSks2rC3SbjvMSr3YX6aG9bW00qkUGDTUykSQSPwnxVoR/5HBMLU9IlDhmrUAfChyGX/YsXXZN3ojSelgXuU+Rfy6QKv2Vwfei9hbufLCEoDQ +X76uBWsV6QJOYvunKBFVNDhv6JDklacSOx6saJGWpccFxFuPrPaTPs9LqggA15Wb1HhYnnSh079IXRY+jmW/MBVjFli9Uo5kyni0Q01HX/mpuJYr0DxNeKD MbdUI/crIJySerATcnTosjMAQIouG4jt1frItX4BlVfMWxrrXkWnT4Su8smUy4O0gATNt4Zw0V1ynVwBL5nYCw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This gets rid of the rather ugly, open coded and suboptimal copy code. Signed-off-by: Nicolas Pitre --- fs/binfmt_flat.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) -- 2.7.4 diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index 085059d879..64feb873f0 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -854,10 +854,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; @@ -892,15 +890,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; - DBG_FLT("p=%lx\n", p); + sp = ((current->mm->context.end_brk + stack_len + 3) & ~3) - 4; + DBG_FLT("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 @@ -912,14 +910,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);