From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24F1EC2BA19 for ; Wed, 15 Apr 2020 13:15:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED4B520575 for ; Wed, 15 Apr 2020 13:15:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Xa0o9Ne/"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="j5EOVEjF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED4B520575 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=tX/xjUnFqD6i9aJVTXoKlyiNL62944q040J0l461e3E=; b=Xa0o9Ne/9rhgjg P4ouUZyoxPiH0ym+vxwRzn1kUw1lCRdzO8j1oqHQ+jheVlD98j4ejfHAUJzHhsNnXQ9GAmWEVOwDL p4He0S1NJfjBsYowKyteQNx4j3sLSOo1VFLvDCSCPfEqsvLK7ajw4r3Cn1vHwguCAiQCbEWMH1IJV nwhl9BMObMvjWH6TQWvU9C+dEOjD8QO0ZEoHV/wLXefAJF/J10Evjv52MaOyTOlOigtmjGtTrj/pS XQY4i81qJ2YViH+0NMClSHMPCMaPaCd4P+AlHj1kI1/F7V/gJ8+PYA0OzpeSzARcSH2oW1Lu+JkIA /Q6nGe9J4xsFxXvAgT9Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOhsZ-0003jl-IJ; Wed, 15 Apr 2020 13:14:59 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jOhq4-0001KE-EW for linux-arm-kernel@lists.infradead.org; Wed, 15 Apr 2020 13:12:26 +0000 Received: from localhost (fw-tnat.cambridge.arm.com [217.140.96.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7F75C20857; Wed, 15 Apr 2020 13:12:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586956344; bh=7Gb5pEw8NWEvarsMXUhOyiosOA/mokLKeIwuzdI/ynE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j5EOVEjFNd8bU0UTEsHEJ26DZylstDvrM7ul7w40UMsN3mPGzrV9/wTuiDcg3bSvY aPM5+Lv8rx95hWPHZQuG9McbSRBhRiAqXzEO7rwrhJwWNYrUpEc1UqcENul/QRr6kT AyDhoDo44XOCqurh0Qzma99Jn0epydCTdT07kawY= From: Mark Brown To: Vincenzo Frascino , Will Deacon , Catalin Marinas Subject: [PATCH 10/10] arm64: vdso: Map the VDSO text with guarded pages when built for BTI Date: Wed, 15 Apr 2020 14:07:50 +0100 Message-Id: <20200415130750.18645-12-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415130750.18645-1-broonie@kernel.org> References: <20200415130750.18645-1-broonie@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200415_061225_088104_2B24C288 X-CRM114-Status: GOOD ( 11.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Brown , Kees Cook , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org The kernel is responsible for mapping the VDSO into userspace processes, including mapping the text section as executable. Handle the mapping of the VDSO for BTI similarly, mapping the text section as guarded pages so the BTI annotations in the VDSO become effective when they are present. This will mean that we can have BTI active for the VDSO in processes that do not otherwise support BTI. This should not be an issue for any expected use of the VDSO. Signed-off-by: Mark Brown --- arch/arm64/kernel/vdso.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 354b11e27c07..9271b7774df0 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -142,6 +142,7 @@ static int __setup_additional_pages(enum arch_vdso_type arch_index, int uses_interp) { unsigned long vdso_base, vdso_text_len, vdso_mapping_len; + unsigned long gp_flags = 0; void *ret; vdso_text_len = vdso_lookup[arch_index].vdso_pages << PAGE_SHIFT; @@ -160,10 +161,13 @@ static int __setup_additional_pages(enum arch_vdso_type arch_index, if (IS_ERR(ret)) goto up_fail; + if (IS_ENABLED(CONFIG_ARM64_BTI_KERNEL) && system_supports_bti()) + gp_flags = VM_ARM64_BTI; + vdso_base += PAGE_SIZE; mm->context.vdso = (void *)vdso_base; ret = _install_special_mapping(mm, vdso_base, vdso_text_len, - VM_READ|VM_EXEC| + VM_READ|VM_EXEC|gp_flags| VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, vdso_lookup[arch_index].cm); if (IS_ERR(ret)) -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel