From patchwork Sun Jul 24 15:30:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 9244965 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 53629607FD for ; Sun, 24 Jul 2016 15:33:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43BB22521F for ; Sun, 24 Jul 2016 15:33:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3888726224; Sun, 24 Jul 2016 15:33:43 +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=unavailable 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 C492A2521F for ; Sun, 24 Jul 2016 15:33:42 +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 1bRLO3-0000fN-Gv; Sun, 24 Jul 2016 15:32:15 +0000 Received: from alt42.smtp-out.videotron.ca ([23.233.128.29]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bRLMq-0008Pt-5h 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 RLMUbAI2TcMN9RLMVbe5oM; Sun, 24 Jul 2016 11:30:39 -0400 X-Authority-Analysis: v=2.1 cv=YqOvP9sX 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=HXuI--bonO9EXLzaknUA: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 0D94D2DA069C; Sun, 24 Jul 2016 11:30:36 -0400 (EDT) From: Nicolas Pitre To: Greg Ungerer , linux-fsdevel@vger.kernel.org Subject: [PATCH v5 08/15] binfmt_flat: use proper user space accessors with old relocs code Date: Sun, 24 Jul 2016 11:30:22 -0400 Message-Id: <1469374229-21585-9-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: MS4wfAhGjtOF0VtVxRjimxiJPykux+qMcmN0Q1TC6s8fAuJfJ2YF9KHuwYGCSDLfcdF4K5YJguexe0tdFciRmYpmVniIP0vZ/TU1CiByis5R6JbfEOFSEkmf llmMAr+57x7M+EttWsvB+9fIU/Eu5XVuM91+6p3iUTJ1wjXGTh5JSlp4qpViDcnCGhBb6JUuMmuj+penPKYeBpJnZ4ugKndDGjPTboi9Np8V4OSLXj/f31LK TEQuuv5wRZQGX4tIIFc2EbkxB3mirNjQW6NIh/Lcaz/y3S1ZagDGlp6vG59rIKFAen6t+3Z7pjj9B7byCvX3GIvZgAclqKJNavUVCfEZp7oCUdI7Iv3Ev1bR Rkb8mj6+GY6GQowwzrropisxO1136tMYzLxNTxoxqnVEoBcgtwsL70MaF4hqa2FvIBKGrIvyuCfXg/WBSwNgzYDbpVdbRp1ikwrl0MkyXeQ0MmB0ZN4= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160724_083100_411160_FA8DD1BE X-CRM114-Status: GOOD ( 11.48 ) 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 Signed-off-by: Nicolas Pitre Reviewed-by: Greg Ungerer --- fs/binfmt_flat.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index 9deafb282d..63756ca6a7 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -379,35 +379,38 @@ static void old_reloc(unsigned long rl) { static const char *segment[] = { "TEXT", "DATA", "BSS", "*UNKNOWN*" }; flat_v2_reloc_t r; - unsigned long *ptr; + unsigned long __user *ptr; + unsigned long val; r.value = rl; #if defined(CONFIG_COLDFIRE) - ptr = (unsigned long *) (current->mm->start_code + r.reloc.offset); + ptr = (unsigned long __user *)(current->mm->start_code + r.reloc.offset); #else - ptr = (unsigned long *) (current->mm->start_data + r.reloc.offset); + ptr = (unsigned long __user *)(current->mm->start_data + r.reloc.offset); #endif + __get_user(val, ptr); pr_debug("Relocation of variable at DATASEG+%x " "(address %p, currently %lx) into segment %s\n", - r.reloc.offset, ptr, *ptr, segment[r.reloc.type]); + r.reloc.offset, ptr, val, segment[r.reloc.type]); switch (r.reloc.type) { case OLD_FLAT_RELOC_TYPE_TEXT: - *ptr += current->mm->start_code; + val += current->mm->start_code; break; case OLD_FLAT_RELOC_TYPE_DATA: - *ptr += current->mm->start_data; + val += current->mm->start_data; break; case OLD_FLAT_RELOC_TYPE_BSS: - *ptr += current->mm->end_data; + val += current->mm->end_data; break; default: pr_err("Unknown relocation type=%x\n", r.reloc.type); break; } + __put_user(val, ptr); - pr_debug("Relocation became %lx\n", *ptr); + pr_debug("Relocation became %lx\n", val); } /****************************************************************************/ @@ -780,8 +783,13 @@ static int load_flat_file(struct linux_binprm *bprm, } } } else { - for (i = 0; i < relocs; i++) - old_reloc(ntohl(reloc[i])); + for (i = 0; i < relocs; i++) { + unsigned long relval; + if (get_user(relval, reloc + i)) + return -EFAULT; + relval = ntohl(relval); + old_reloc(relval); + } } flush_icache_range(start_code, end_code);