From patchwork Mon Oct 1 17:58:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10622525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9703F17E0 for ; Mon, 1 Oct 2018 18:10:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82CF8284C9 for ; Mon, 1 Oct 2018 18:10:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80B9F284E8; Mon, 1 Oct 2018 18:10:18 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 D6E3E284FF for ; Mon, 1 Oct 2018 18:10:17 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=c1GRnDeML3gxr+h+k4YSaOphzGCF1sK3cIsXnq6kabg=; b=OkXefz9s8vAFD2 9B4IAzMkT3JYOz0dxFO/ZNZ7ptxcVfi4RqrWCXLkwNDeuQB24pO8pccMWfKd7HdrmbLBkBkWVITqx hZZyfPtGMUlgoBeee6Wpy7eZi9yY6P8wWMeGh0Ve5HK69ULA8a9F1FUmU52uxPTbILoraGfPPdWbP 2khaCz8T+M/KtxlzXLWo9JeMGPz/Wq1JpdDiXPTYED9UU9cBgwK3gDxf2oR+c+FMoMJ4F1/X2J0nn wc9h5I05RdanIdlaLZlx8S/OULBrOdSd/WAnnLvrflq/4dU2DlJGp5X/9Apkkimr1NtSHDCjNgQ1M AwZ56tmAyNEg4OFYUHgg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g72du-0003DZ-PD; Mon, 01 Oct 2018 18:10:02 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g72Z5-0008UC-Di for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2018 18:07:03 +0000 Received: by mail-pf1-x444.google.com with SMTP id d4-v6so9821382pfn.0 for ; Mon, 01 Oct 2018 11:04:53 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=WWliIodzBkjg/YvVrM0vD1BBjyk86A4iDE2GhInXr68=; b=qJBcg+SMf0bBhav/XKsrHsnUEr8fqNOqIyTleeRJtIIeO2LHHW8liGZ6Bj0zbZ26kz JTWQ0VFWqLKU/uKRX3GxAB9hyGw7JLltnKBNLfYIhiAH5SnMJZDNcfLR09K7UfIvA6S+ Cpv3C6FCTDUrK1ZT89uK5g6IbB4XDo9117ERAoGZLKOhCx9klEvMP24zdatyH1syLZLx TAq2H759J2P0+lB/+rP1F8BNZiIWkOqkuVydkFbmxAFVVRZOl9dQGHuAyo7E4o7XdavS MLH39vo6cv0njDhtp9JPBRURhEGywmjGDft+L6aaQcNoRc5Jcq2BiOs/SylpKnsoTN4t eQFQ== 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:mime-version:content-transfer-encoding; bh=WWliIodzBkjg/YvVrM0vD1BBjyk86A4iDE2GhInXr68=; b=W4qqHTA5GCYfJvvKE9u26FaPQXU6WgKAUktigLJPNarIcXnY82AEM6k8PayxO6CkKu wNwXEFRkcjPfVvIod0/LO5DX9tmvewkVIKo3+aFIIgA0EJi+I7ODX28mqJ4x4MT8Tqkg T6J6iqhkijWxQWOQenUeeovgcdnjLftv1qXCUOjXDBcQLMStqVvyqKu1Mmx94TWlwFBK F8tVk0TreZLsMtwAzC0jIpPiLJv/WCI0dTDdQost+vEmDUCFVl+Pucx4phj4EJbb0EI0 KQ5nxNtkjVGWu2VbdMQkaQ3uvwZf9Kv6qlRBkFTUCfUkIT55elH6SJNqMrLd0WfPB1vS CYHQ== X-Gm-Message-State: ABuFfoj6/yAHDOaprx+FKub8W+x0jo9eFgMRPXH/hlLrcoARZZoJGID9 dqDj3h9D5dizVciq3gsds+e/hA== X-Google-Smtp-Source: ACcGV63OkG+zVeZll+/FlhgOeIhhQ9b8adrsZya5tFZZK7RuefGpR8JqafmQuzi2hn+9i9qViwmh0w== X-Received: by 2002:a63:8c0b:: with SMTP id m11-v6mr11187164pgd.372.1538417092395; Mon, 01 Oct 2018 11:04:52 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([2620:0:1000:1612:b4fb:6752:f21f:3502]) by smtp.gmail.com with ESMTPSA id d186-v6sm24469261pfg.173.2018.10.01.11.04.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 11:04:51 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: RESEND [PATCH 5/6] arm64: compat: 32-bit vDSO setup Date: Mon, 1 Oct 2018 10:58:42 -0700 Message-Id: <20181001175845.168430-23-salyzyn@android.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog In-Reply-To: <20181001175845.168430-1-salyzyn@android.com> References: <20181001175845.168430-1-salyzyn@android.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181001_110503_551049_F419EBFF X-CRM114-Status: GOOD ( 16.92 ) 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: Mark Rutland , Laura Abbott , Kees Cook , Ard Biesheuvel , Catalin Marinas , Kevin Brodsky , Will Deacon , Russell King , Jeremy Linton , Mark Salyzyn , android-kernel@android.com, James Morse , Andrew Pinski , Dmitry Safonov , Andy Gross , John Stultz , Thomas Gleixner , Andy Lutomirski , linux-arm-kernel@lists.infradead.org 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 Tested-by: Mark Salyzyn Cc: James Morse Cc: Russell King Cc: Catalin Marinas Cc: Will Deacon Cc: Andy Lutomirski Cc: Dmitry Safonov Cc: John Stultz Cc: Mark Rutland Cc: Laura Abbott Cc: Kees Cook Cc: Ard Biesheuvel Cc: Andy Gross Cc: Andrew Pinski Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: Jeremy Linton Cc: android-kernel@android.com --- 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 8529e85a521f..9fb1e0d380ab 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;