From patchwork Wed Nov 15 22:05:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10060459 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 61EBB604D4 for ; Wed, 15 Nov 2017 22:33:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 557722A34F for ; Wed, 15 Nov 2017 22:33:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47DCF2A34E; Wed, 15 Nov 2017 22:33:44 +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,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AC4392A34F for ; Wed, 15 Nov 2017 22:33:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Q6t1LP1vWWTf5NxNGOlLpMn6ZnJEpVUFxH9KHX53tro=; b=SYLZgu3HLvHButOvXVyXkCgFR9 4CcH0aN+8nc39wdVn376WABr/b7XbwdgqiY4+2jySzJJTpSztylSzeNw/hc8L84LJwfE8TihT4gFs bfn8IVhe53U2C6FPQoXZ+TAL7MPcnY6Ug6ofIZjlzcMZemsGlzJXwJd7RDkvOu2Xquj2qu88R6oHt qBrpXsOmemc/p4TLoMWJc06kfXEAZXR3nn7J4WBRSqnptJlHzdLcX37riInU2eCZgSHH1cnfQXzCm VZEd3ODB7PI9ifq6AkmSpHZBCfs3JOBtkkobjhZwozZlrfu22OtLj5ITqTRp2FGaVrVKbGiS4DYWS p5b8/egA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eF6FE-0004Gb-3W; Wed, 15 Nov 2017 22:33:20 +0000 Received: from mail-it0-x242.google.com ([2607:f8b0:4001:c0b::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eF5qJ-0007Qm-75 for linux-arm-kernel@lists.infradead.org; Wed, 15 Nov 2017 22:08:19 +0000 Received: by mail-it0-x242.google.com with SMTP id l196so3553685itl.4 for ; Wed, 15 Nov 2017 14:07:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Hlj6xBXLevVR6lHXdnsgclYaaccOOaKa6iSQeRt3SJg=; b=qHZCWmzcSFZ2fgNS/riE6pmeWSQEfJF+pYYCAS8dhVgOKS9W5MktVIbY0dRs0TxXP2 9fBHTVtWZmoMGgMlGvUTjv5DK+kRmtDTyynyX/Uuh967mOecx/aslc9od5EWkIRQUatT woA6KHWtWAPusTXKi2UiKr8S71Rb6gcKlQ09uKH0JU+L6JgxCxga8dpc65sn2lYgekqE HQFdoyPVqFBud6q62cQu6ceQ+8kJsb9ZGI1vei+/5fQDn2PYhjkvfJUr7gdvhSpiLbDH SdbIOR6Efkl9sgbNN5deGoWk7ZnAtHPmpk9OMeka838a2XjF596GvZ4WcxRkR8dziLVx I0Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Hlj6xBXLevVR6lHXdnsgclYaaccOOaKa6iSQeRt3SJg=; b=nNc/yjuaspTiknPirhvyTTT3cDgOclWhTG9St9CWXs+ovmMgLdPV1vFXAW9/rG0TrK wvaz72xqw3y9NV9zMisKZ/pvg7+DGcOt71q+/AjScrTeF99B7G7s4ogeKPZ5KX4fFkhG EP3MWtdv0XihkuCfMql4Idua/I+QPpkAX/468ogb5HOYMgWig1MCkgJd1bsv2hXXeQG8 QoaaSSwylvnFwpPLMtetcuYgkuIQKN9j4zRnAupl5KjNJ87DewRKQtRu8/DPHrVDMVeG VPLPZiy9N6993u0vhyY1hogIuKAvprHXOi9/GVoF3s/w7abDIFX8g/QMVqdVbQHltV7J LrmA== X-Gm-Message-State: AJaThX4sQbw4gNV+d+qO8a2DZcFIu513JZREb1uSL05UyTQFIXAXmNai 2hQ2BnYQksH3JosG4a41RTR3rQ== X-Google-Smtp-Source: AGs4zMbhNOGwSFxhjGctnkSKssJqIpTxmHFkR5GSfgv3hP/64bjHZzR8QZkgQvPXot0IeNtrUaq6Iw== X-Received: by 10.36.60.86 with SMTP id m83mr20958866ita.25.1510783634398; Wed, 15 Nov 2017 14:07:14 -0800 (PST) Received: from nebulus.mtv.corp.google.com ([2620:0:1000:1612:b4fb:6752:f21f:3502]) by smtp.gmail.com with ESMTPSA id 14sm5224751itj.34.2017.11.15.14.07.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Nov 2017 14:07:13 -0800 (PST) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH 5/6] arm64: compat: 32-bit vDSO setup Date: Wed, 15 Nov 2017 14:05:15 -0800 Message-Id: <20171115220529.14458-6-salyzyn@android.com> X-Mailer: git-send-email 2.15.0.448.gf294e3d99a-goog In-Reply-To: <20171115220529.14458-1-salyzyn@android.com> References: <20171115220529.14458-1-salyzyn@android.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171115_140735_949851_512341C9 X-CRM114-Status: GOOD ( 13.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kees Cook , Catalin Marinas , Kevin Brodsky , Will Deacon , Mark Salyzyn , John Stultz , "Eric W. Biederman" , Dmitry Safonov , Dave Martin , 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 From: Kevin Brodsky If the compat vDSO is enabled, install it in compat processes. In this case, the compat vDSO replaces the sigreturn page (it provides its own sigreturn trampolines). Signed-off-by: Kevin Brodsky Signed-off-by: Mark Salyzyn Cc: Catalin Marinas Cc: Will Deacon Cc: Dave Martin Cc: "Eric W. Biederman" Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm64/kernel/vdso.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 48b4111a933f..9d44ce962538 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -58,6 +58,7 @@ struct vdso_data *vdso_data = &vdso_data_store.data; /* * Create and map the vectors page for AArch32 tasks. */ +#if !defined(CONFIG_VDSO32) || defined(CONFIG_KUSER_HELPERS) static struct page *vectors_page[] __ro_after_init; static const struct vm_special_mapping compat_vdso_spec[] = { { @@ -73,6 +74,7 @@ static const struct vm_special_mapping compat_vdso_spec[] = { #endif }; static struct page *vectors_page[ARRAY_SIZE(compat_vdso_spec)] __ro_after_init; +#endif static int __init alloc_vectors_page(void) { @@ -82,6 +84,7 @@ static int __init alloc_vectors_page(void) unsigned long kuser_vpage; #endif +#ifndef CONFIG_VDSO32 extern char __aarch32_sigret_code_start[], __aarch32_sigret_code_end[]; size_t sigret_sz = __aarch32_sigret_code_end - __aarch32_sigret_code_start; @@ -90,19 +93,24 @@ static int __init alloc_vectors_page(void) sigret_vpage = get_zeroed_page(GFP_ATOMIC); if (!sigret_vpage) return -ENOMEM; +#endif #ifdef CONFIG_KUSER_HELPERS kuser_vpage = get_zeroed_page(GFP_ATOMIC); if (!kuser_vpage) { +#ifndef CONFIG_VDSO32 free_page(sigret_vpage); +#endif return -ENOMEM; } #endif +#ifndef CONFIG_VDSO32 /* sigreturn code */ memcpy((void *)sigret_vpage, __aarch32_sigret_code_start, sigret_sz); flush_icache_range(sigret_vpage, sigret_vpage + PAGE_SIZE); vectors_page[0] = virt_to_page(sigret_vpage); +#endif #ifdef CONFIG_KUSER_HELPERS /* kuser helpers */ @@ -116,6 +124,7 @@ static int __init alloc_vectors_page(void) } arch_initcall(alloc_vectors_page); +#ifndef CONFIG_VDSO32 int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp) { struct mm_struct *mm = current->mm; @@ -151,6 +160,7 @@ int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp) return PTR_ERR_OR_ZERO(ret); } +#endif /* !CONFIG_VDSO32 */ #endif /* CONFIG_COMPAT */ static int vdso_mremap(const struct vm_special_mapping *sm, @@ -221,6 +231,23 @@ static int __init vdso_mappings_init(const char *name, return 0; } +#ifdef CONFIG_COMPAT +#ifdef CONFIG_VDSO32 + +static struct vdso_mappings vdso32_mappings __ro_after_init; + +static int __init vdso32_init(void) +{ + extern char vdso32_start[], vdso32_end[]; + + return vdso_mappings_init("vdso32", vdso32_start, vdso32_end, + &vdso32_mappings); +} +arch_initcall(vdso32_init); + +#endif /* CONFIG_VDSO32 */ +#endif /* CONFIG_COMPAT */ + static struct vdso_mappings vdso_mappings __ro_after_init; static int __init vdso_init(void) @@ -263,6 +290,34 @@ static int vdso_setup(struct mm_struct *mm, return PTR_ERR_OR_ZERO(ret); } +#ifdef CONFIG_COMPAT +#ifdef CONFIG_VDSO32 +int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp) +{ + struct mm_struct *mm = current->mm; + void *ret; + + if (down_write_killable(&mm->mmap_sem)) + return -EINTR; + + ret = ERR_PTR(vdso_setup(mm, &vdso32_mappings)); +#ifdef CONFIG_KUSER_HELPERS + if (!IS_ERR(ret)) + /* Map the kuser helpers at the ABI-defined high address. */ + ret = _install_special_mapping(mm, AARCH32_KUSER_HELPERS_BASE, + PAGE_SIZE, + VM_READ|VM_EXEC| + VM_MAYREAD|VM_MAYEXEC, + &compat_vdso_spec[1]); +#endif + + up_write(&mm->mmap_sem); + + return PTR_ERR_OR_ZERO(ret); +} +#endif /* CONFIG_VDSO32 */ +#endif /* CONFIG_COMPAT */ + int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) { struct mm_struct *mm = current->mm;