From patchwork Mon Oct 1 17:58:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10622515 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 9EA42112B for ; Mon, 1 Oct 2018 18:06:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A400282E8 for ; Mon, 1 Oct 2018 18:06:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7CE47284D1; Mon, 1 Oct 2018 18:06:40 +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 E7450282E8 for ; Mon, 1 Oct 2018 18:06:39 +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=KqudGmV0OHzgrGqZeH3B/inWIff2iyAca1stS3yut2E=; b=YSoNdU2DkafFQQ bIQM7z63NF8NRwop4fywZrOxtZhK7Xuuj5s6QQvCaR6U5f9qXaLm7CoryL9wyw82q3/tiqSREt4Wm FopBjf4xngLZWVF5OVTjYdtReG0/Gq6uwREk8eVFoSK8RS/P3C5qZ7KaX89xY0bbpgpIpsOXsDGIZ EIvGA500t0G8w30Su5kBUY8YAEteLkLwQBzFHkH2OdWzdDFNb7GAijeHGzt1HR4a1b+yw6o5BsQ8L oAguxuURMdS5/Qq4dnTQlrfeomhw750Ou5Eq2QJ0vSXkyT+p9ABJRUB13rAKJxAT21k103x1oEfPo AJwCSex7J9ujGeDXnyHA==; 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 1g72aS-0001qf-Tx; Mon, 01 Oct 2018 18:06:29 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g72YG-000892-FK for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2018 18:04:56 +0000 Received: by mail-pf1-x442.google.com with SMTP id p24-v6so1283712pff.10 for ; Mon, 01 Oct 2018 11:04:02 -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=kiIGQCmGtALrXwsBG8zSqpjHC9E+lsH1ZMYz/Tcb/9o=; b=KSUBKvLxsj68k0Si0J4ZR79pL0sEeAxw19tZFkj8bmO8cwrgukdO7fSTH0Trjfamzu nzdqvr78u9mIb+cE4sexVRirTM1ono+O/YnveR57mLO6kDMF1pKH8kDl+M8z8R7kMc9N 3+YEBCTxd19rMX0rMJygiJcoFysYtHoWDx+YYQR7k+agXXNxPhb2/IvLIoA6oWnxx7LN hbXAoKA0T9DbY9sCKOfU7gqDaM097KeBKMspLn7pjde8AA6ZIb6svxzG/YPSJCAAcYxy BYSi/7sZSoniP5oJr2VSSnCNBGE+UNrQt51mv9s4fa4xHStZ/TmvEC2xVWSP7z9p2tay DXgQ== 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=kiIGQCmGtALrXwsBG8zSqpjHC9E+lsH1ZMYz/Tcb/9o=; b=G1vpQVytwwDxVvU6SeVr8mEgDRlv+G9Np/8mTPzL1ECNiTk5pP1l5TSWy73w4FxBa7 Bds/ZDx55fXIJzbzM0o20TA2VtvKargdmu2kQSVWpEDmJ7VMhV57j+P3CmiWvbEvea/7 AtiLMIkMlenFeJHRtBU7X7zjIgzU87RtPvNyLYj+qzTme4PLfkPB4BzSowXmt/MSH04x NTW5EbVhRPK1n9tWAAFapfOubzRm67tchhpJOHuUtaaZpBnBerslGayO/DAnjEpqGrJW sJevEVZtKJNH7OORTbBjZi8+GbgaeDyrfH4y+DimCf+dpwntiOqSSVTcXYbpFpqivEmw /mGQ== X-Gm-Message-State: ABuFfogMETIUSXwVJBue/dc4KXLppwdO0j6YBx3cWq+boN0IZ17n6e2T mGGWgxSdfJTmnnJSn1lqh2Wo6A== X-Google-Smtp-Source: ACcGV61FylkwMpjFO9AFBbrygEHvfEKfXQfB/69kZ7FS9w7P3QWvHl9+wmuaFO+I6LLkZLsepvY5vw== X-Received: by 2002:a17:902:ac1:: with SMTP id 59-v6mr12949742plp.18.1538417041389; Mon, 01 Oct 2018 11:04:01 -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.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 11:04:00 -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, 1 Oct 2018 10:58:38 -0700 Message-Id: <20181001175845.168430-19-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_110412_641096_B8A3056D X-CRM114-Status: GOOD ( 15.45 ) 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 , Dave Martin , linux-arm-kernel@lists.infradead.org, "Eric W. Biederman" 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 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/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 6b421666b5b8..c3d9a74e3945 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; @@ -352,6 +353,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; @@ -359,6 +373,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;