From patchwork Mon Jun 18 15:06:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10472107 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 A9075601D7 for ; Mon, 18 Jun 2018 15:34:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97FDF28A39 for ; Mon, 18 Jun 2018 15:34:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AC6728A40; Mon, 18 Jun 2018 15:34:28 +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 autolearn=unavailable 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 0EC5828A39 for ; Mon, 18 Jun 2018 15:34:28 +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=F5EBXB3yJ4M7C7J1DIq7MPunRqBB3Yg+8ji1HWeD/a4=; b=u+wOtmvDQkBWMcI/yMdOeRWL0g iaH3JgkeDKaciWEwX1uyTHH4m6sa0tfLVy/9y4tEiE+tWrL1XRPG6WoGkqOMWtxG0wYkP2rfCsjHB 1IcAFodQ77ZPjaBSvxZYRFYXGBVAk/FhMP1+OkUA+CgDRdrhGv8s0tUY3TJIQfgcP9D8owfMw9bgQ k0E1Xwet6bkmKH/H/otvJtsT5CWB3DfYaXLPtdzFSe3FSZYkg/Wdc7FEITfgb98LjlFCfYAQuMPzG JFkrIum1GVflKH02j8SzXgfveRBYbpGBqtFJLlK3ZQdyTHlpDFYD+1SZqNWZbjrA/ANMwcZ/HhFxp hQMrazLQ==; 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 1fUwAc-0002Ha-SB; Mon, 18 Jun 2018 15:34:18 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUvvn-0000OV-PK for linux-arm-kernel@bombadil.infradead.org; Mon, 18 Jun 2018 15:19:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4NAG7hzXUC7y7frdcTzxZYfU3GpX9HZN0SD1UZIE0Yk=; b=HGqymv3hf6j0bJstY4/n4133J /u8ujTtBKcEGEKhNotxQoBR+MlnxEiBlVGkGXnW+spt/cG3yryGP+mtzCBJHjXxJ9LLclaxqZ1o3r h+K3zcVF4Q9bK9rydi5abQ1DwFlzcoHa9q+Sol1hRCm4PjoCWl46ac8Fzmy9Nq1xPc981H67WE9FG gIDIG6l2S/ntx8Q933WFFK1d1gQQ1rikQYjLqIWOpK+rdkAsGlGtKd46JYFkyeUM0MfHWZXIHdf2B MhFsZTJdK7EYvkHOYy7Ur0ERX5Mb9p0pl6krtLTUrIEvgvYS81xc83VXYTmyw1gOl7890vjlXJ49Z UUwtSdupw==; Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUvmz-0000Jl-NE for linux-arm-kernel@lists.infradead.org; Mon, 18 Jun 2018 15:09:54 +0000 Received: by mail-pg0-x243.google.com with SMTP id e11-v6so7674990pgq.0 for ; Mon, 18 Jun 2018 08:09:43 -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; bh=4NAG7hzXUC7y7frdcTzxZYfU3GpX9HZN0SD1UZIE0Yk=; b=DsDlZHYArPoA1Pb7vK4oDE4O7fCqck8USieAMKDXuZ19a5AiHBpRRokXov9D2cQY6z EcOZAMuCDSPekBGWcUEntS/kny7qHg6BYTWxTF/pB0k25uMktOiD1886pGFl/h/i00Ti UqnG8RvAomok/SObRLDslxGFRHmPb0hODWdpNkOVHCoK9m7XO9ZiKj2lwjTXtqB7P6Wg q9AUFOm3W6eEk1IQA1/jonD8EG+LOu9R6pHWgR/QArhPg4r568ldvIS5CfWyYYziZwBX JIF/wb/hs7e2wCyS93eLhDcns8dJyjjTHGqjCc3LxVPRXkKhwiQ7U5X0TlkSVm7UUTsr B3Jw== 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=4NAG7hzXUC7y7frdcTzxZYfU3GpX9HZN0SD1UZIE0Yk=; b=jnuVoshe8sQ0O+L84CFbHh1HRMSJVdmF6Bv2yKxDqC7wjJpRu1EMLpDcU9LYK3rBBW l4EsOmmiDOVxx5ITi7WKwoUCLLbKie49HHk7HbzjsWOz4mkTomWefpaXjNJbTWs2SGMv kSmQ+SQZyJThO3VzbecJo4vSKLGPjiPGjUiJJLMDeAo0ZYe2nRWpiaSkmR4GiCyiWlyz 2XGN3bgXawNRslWwJP06S3tEzgHpLXicThv40nWZ8KgINI2V/YxKnnkUF4XH/p3kutPV ZvWusVeg+nSY4/T1Km45eZywpkB8n8M4D9Y05EjIB1L9O+LOua/Wodu2C/IA4ywqv7ZV MaBA== X-Gm-Message-State: APt69E3I4Sml0JZgEMOWnlu/0kzspzjKHCZdxD1kaZaSWy91kwnCiv7j ji+zhozDrTxZ+LxQMYi2bOUb3w== X-Google-Smtp-Source: ADUXVKKRJDjK89MbmamOu74nYl/qgHpF3Qorlhiak7ulOtfbBA3N3hX6d7P5n6SjHWawSGWjjVmsmg== X-Received: by 2002:a62:484d:: with SMTP id v74-v6mr14091182pfa.256.1529334581231; Mon, 18 Jun 2018 08:09:41 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([2620:0:1000:1611:6077:8eec:bc7e:d0f4]) by smtp.gmail.com with ESMTPSA id i7-v6sm54830660pfa.34.2018.06.18.08.09.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 08:09:40 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: RESEND [PATCH 1/6] arm64: compat: Use vDSO sigreturn trampolines if available Date: Mon, 18 Jun 2018 08:06:04 -0700 Message-Id: <20180618150613.10322-19-salyzyn@android.com> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-goog In-Reply-To: <20180618150613.10322-1-salyzyn@android.com> References: <20180618150613.10322-1-salyzyn@android.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180618_110953_791141_CF8AFF6D X-CRM114-Status: GOOD ( 18.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 , James Morse , Andrew Pinski , Dmitry Safonov , Andy Gross , John Stultz , Thomas Gleixner , Andy Lutomirski , Dave Martin , linux-arm-kernel@lists.infradead.org, "Eric W. Biederman" 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, it replaces the sigreturn page. Therefore, we use the sigreturn trampolines the vDSO provides instead. Signed-off-by: Kevin Brodsky Signed-off-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 --- arch/arm64/include/asm/vdso.h | 3 +++ arch/arm64/kernel/signal32.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/arch/arm64/include/asm/vdso.h b/arch/arm64/include/asm/vdso.h index 839ce0031bd5..f2a952338f1e 100644 --- a/arch/arm64/include/asm/vdso.h +++ b/arch/arm64/include/asm/vdso.h @@ -28,6 +28,9 @@ #ifndef __ASSEMBLY__ #include +#ifdef CONFIG_VDSO32 +#include +#endif #define VDSO_SYMBOL(base, name) \ ({ \ diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index 096c88731c56..5ee07da53fd1 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -29,6 +29,7 @@ #include #include #include +#include struct compat_vfp_sigframe { compat_ulong_t magic; @@ -347,6 +348,19 @@ static void compat_setup_return(struct pt_regs *regs, struct k_sigaction *ka, retcode = ptr_to_compat(ka->sa.sa_restorer); } else { /* Set up sigreturn pointer */ +#ifdef CONFIG_VDSO32 + void *vdso_base = current->mm->context.vdso; + void *trampoline = + (ka->sa.sa_flags & SA_SIGINFO + ? (thumb + ? VDSO_SYMBOL(vdso_base, compat_rt_sigreturn_thumb) + : VDSO_SYMBOL(vdso_base, compat_rt_sigreturn_arm)) + : (thumb + ? VDSO_SYMBOL(vdso_base, compat_sigreturn_thumb) + : VDSO_SYMBOL(vdso_base, compat_sigreturn_arm))); + + retcode = ptr_to_compat(trampoline) + thumb; +#else void *sigreturn_base = current->mm->context.vdso; unsigned int idx = thumb << 1; @@ -354,6 +368,7 @@ static void compat_setup_return(struct pt_regs *regs, struct k_sigaction *ka, idx += 3; retcode = ptr_to_compat(sigreturn_base) + (idx << 2) + thumb; +#endif } regs->regs[0] = usig;