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: 72670 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp743775qga; Sun, 24 Jul 2016 08:31:31 -0700 (PDT) X-Received: by 10.98.92.65 with SMTP id q62mr22369731pfb.70.1469374286959; Sun, 24 Jul 2016 08:31:26 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gp10si28513107pac.79.2016.07.24.08.31.26; Sun, 24 Jul 2016 08:31:26 -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 S1752525AbcGXPbR (ORCPT + 29 others); Sun, 24 Jul 2016 11:31:17 -0400 Received: from alt42.smtp-out.videotron.ca ([23.233.128.29]:52225 "EHLO alt42.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752164AbcGXPam (ORCPT ); Sun, 24 Jul 2016 11:30:42 -0400 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 Cc: Alan Cox , Alexander Viro , David Howells , linux-arm-kernel@lists.infradead.org, linux-m68k@lists.linux-m68k.org, linux-kernel@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= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Nicolas Pitre Reviewed-by: Greg Ungerer --- fs/binfmt_flat.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) -- 2.7.4 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);