From patchwork Wed Nov 15 22:05:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10060449 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 4C77860231 for ; Wed, 15 Nov 2017 22:18:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41F662A30B for ; Wed, 15 Nov 2017 22:18:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3635F2A330; Wed, 15 Nov 2017 22:18:53 +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 DD69A2A30B for ; Wed, 15 Nov 2017 22:18:52 +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=EX/b52VcaZjHvpn+9ig6ry+uwxWphTAXXycLSlsvxbo=; b=FyQKAACABJ/qYFHxfnRZ9kNI2U N9hT1EJvYDPNjctCNyTbB1Q30IbNbFFY5+r2/nzvw0Jt8wrv1HvU8RHo41T2glcL2vvEraZDetEbj afoVNCqn75b6R4qttfjbz5bWJafyfR2jJSVTCMFAANCdxwwsSap6OL+kS1yP2Y4GUDROC8pxiHV8N 6gnlc/sPt4BhnRvsLARbdQENyQrzqxlFF4iJ2pLs6mcImZWr117RdrFZYhGWLTMsi9f9alD5jnika yzM2RQvVPlA011KT5qEkJCA0lnqvGXSsMPeqVg/Itauu190KMqAtn09HgRc8531gHhaLFnD2aGFcW IVLUDrOg==; 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 1eF61E-0005AA-2Y; Wed, 15 Nov 2017 22:18:52 +0000 Received: from mail-io0-x243.google.com ([2607:f8b0:4001:c06::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eF5pO-0006pS-7U for linux-arm-kernel@lists.infradead.org; Wed, 15 Nov 2017 22:06:44 +0000 Received: by mail-io0-x243.google.com with SMTP id w127so3167334iow.11 for ; Wed, 15 Nov 2017 14:06:17 -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=r+Bm9lqjMqpHwwSJ9SvQioNUrqrAXKqxFHItcpyj+cM=; b=SG5itn+Yvf/nI/zeJD5ZaZS/VgWK6Aw4QjYVsveuPtdkaOtJyUl8/8+vsbmtCGPq+v eGJDuyja1x7OiGs5r9p32Z8wtlwZF9epSe42/8NZDou9ISoEXjP8dIog4lXQcrulH9gw fIJAEfs+oKjLza6MoWJapcAZkyEde34gxEDLmpZxQWJltWhyAyxcvTDjZeedaaVGwQuI MAuJ/NYmCU5o7r+Vz0t0ZBDt6CvBygnQ7RcyKnRq7JHIK8Q/VFh9QwtQV11XN7HnWnoV H7F3X5wgiRf+orWr7ZtHALy2uRdxMsrdyEMyAZYPpiXGK0JVjXOfMWu5FmA0OrOgdML0 /K2A== 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=r+Bm9lqjMqpHwwSJ9SvQioNUrqrAXKqxFHItcpyj+cM=; b=LAx0RPgmAJ5ycG+vTF3U+bNPpdIxZr2XyVKhsJe4PAOhJsYZi77xtJcgtyPu/ZuSoU dvdcGGt/C43kPsFPFy0R05GxoU2D8Xgz4Voqztu93knDF0GebEM38T4Uw8otf+gBAQ0d GWZMmK4EVvO9LxGrYAO2/bA0G97BM4TuOhFm8sJe3XIouOg/snaBET+Ct2mSX2Sp0ZTs tiOdh8Fz91AJMPFq6/ZoEga1NNqQl7LQyL5kBGBypahDgFG10C32BdsCUdSEkosy0292 pi3Rg29zKdZ1KYQqQ8xmDQmkEKgQ8577GcaHb69saWuiBZn2FVpgo5tpj6BJdfVSYCuG wllQ== X-Gm-Message-State: AJaThX69vTyIKtIAs43EkIaWvYiXAzT43hoNQ4KF2CvfHBZPeh9MWmDW BbAgctDmndVfSYM43iMII7Z3rg== X-Google-Smtp-Source: AGs4zMankPV59Ib9E8MERzx/k+EpXjGONpw3CSE1MM6UlMvm9i352EvuYm3GDmcCquU8mjYD+CEdzQ== X-Received: by 10.107.83.10 with SMTP id h10mr22385800iob.242.1510783575717; Wed, 15 Nov 2017 14:06:15 -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.06.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Nov 2017 14:06:15 -0800 (PST) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH 1/6] arm64: compat: Use vDSO sigreturn trampolines if available Date: Wed, 15 Nov 2017 14:05:11 -0800 Message-Id: <20171115220529.14458-2-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_140639_265057_7A64150F X-CRM114-Status: GOOD ( 11.95 ) 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: Catalin Marinas , Kevin Brodsky , Will Deacon , Mark Salyzyn , "Eric W. Biederman" , 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, 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: 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/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 4f0c0aa14cba..37095782622d 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -28,6 +28,7 @@ #include #include #include +#include struct compat_vfp_sigframe { compat_ulong_t magic; @@ -433,6 +434,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; @@ -440,6 +454,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;