From patchwork Sun Jul 24 15:30:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 9244961 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 0E03D607FD for ; Sun, 24 Jul 2016 15:33:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F21B32521F for ; Sun, 24 Jul 2016 15:33:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6B8326224; Sun, 24 Jul 2016 15:33:24 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 99E212521F for ; Sun, 24 Jul 2016 15:33:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bRLNk-0000MI-Oh; Sun, 24 Jul 2016 15:31:56 +0000 Received: from alt32.smtp-out.videotron.ca ([24.53.0.21]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bRLMq-0008Px-4p for linux-arm-kernel@lists.infradead.org; Sun, 24 Jul 2016 15:31:04 +0000 Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id RLMUbeEZXYOXTRLMVbJ3Gt; Sun, 24 Jul 2016 11:30:39 -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=tBb2bbeoAAAA:8 a=R5CuANmm5DveqMR5uOoA: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 49D4E2DA06A4; Sun, 24 Jul 2016 11:30:36 -0400 (EDT) From: Nicolas Pitre To: Greg Ungerer , linux-fsdevel@vger.kernel.org Subject: [PATCH v5 10/15] binfmt_flat: update libraries' data segment pointer with userspace accessors Date: Sun, 24 Jul 2016 11:30:24 -0400 Message-Id: <1469374229-21585-11-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: MS4wfOhT0Vew7D3vash1skWf/VA7GHtJiRcwfax88o8+XuGJrXzoXt/8eciNThjV8YWOFgtFiiiU77L+wqHJp+ZzZ6vMKrDxDRUQ12mqURgvudwXU/tVY/Uy Nh5EoBTaH4uDTVd+d30sKDOiSCi1x5HjoY65h6Uv72Oq1XyvQuIDWkQDtLvZiCeyRP9X8dQp9jd3U38Rss6YTeg3Hp5XhxfjkGKaDnlotP7V0pHrNnI9Qkbt m9EvEaqkk7Gma+MbKrWIiNJ2Q+3ghj0M5VvJry/8X9zf7R1N/k/lYErp0sFiim3N8sJ8gahzVUT3uj9nN3dticM8vLbGLoZ6VKj1/dphptH+uInArk8//7ZX BBJXkhhlbB8PuSQOd6VppoHK7pBO4834cDKJzChRqW6N+BcXVW9w1HNZ+KwRRbx9ymEIzbfucBC0RbtJTemTf0WUCNrpUAVYJlY02cF31YsFqETWT38= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160724_083100_470703_8669F658 X-CRM114-Status: GOOD ( 11.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alan Cox , linux-kernel@vger.kernel.org, David Howells , linux-m68k@lists.linux-m68k.org, Alexander Viro , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This is needed on systems with a MMU. This also gets rid of the strangest C code I've seen lateli i.e. an integer indexed with a pointer value within square brackets. That really looked backwards. Signed-off-by: Nicolas Pitre Reviewed-by: Greg Ungerer --- fs/binfmt_flat.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index 92c1530a2c..aa7971ce6a 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -894,12 +894,19 @@ static int load_flat_binary(struct linux_binprm *bprm) return res; /* Update data segment pointers for all libraries */ - for (i = 0; i < MAX_SHARED_LIBS; i++) - if (libinfo.lib_list[i].loaded) - for (j = 0; j < MAX_SHARED_LIBS; j++) - (-(j+1))[(unsigned long *)(libinfo.lib_list[i].start_data)] = - (libinfo.lib_list[j].loaded) ? - libinfo.lib_list[j].start_data : UNLOADED_LIB; + for (i = 0; i < MAX_SHARED_LIBS; i++) { + if (!libinfo.lib_list[i].loaded) + continue; + for (j = 0; j < MAX_SHARED_LIBS; j++) { + unsigned long val = libinfo.lib_list[j].loaded ? + libinfo.lib_list[j].start_data : UNLOADED_LIB; + unsigned long __user *p = (unsigned long __user *) + libinfo.lib_list[i].start_data; + p -= j + 1; + if (put_user(val, p)) + return -EFAULT; + } + } install_exec_creds(bprm);