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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 89AFBC282CB for ; Mon, 4 Feb 2019 11:11:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5561D20815 for ; Mon, 4 Feb 2019 11:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549278697; bh=ZXOWAUIxAvWXy4Qgcsp+7DnjRvlcLInpELns/YW2+mg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OPdn+aGDmQFj1rrKipBP9MYQd/EVt6nd9msFVHcdIelDdzfJlGi8fc7lY+ZwX9t12 CShkrIcF8ylggUYSt1Pgzpr8Cxy5hF1793LdLSUGPo6kHpso6kp/AbGen4suW/Nalt 3/7lBmyPplCGOYfU3elT0RjsNHZXrNP0EuecaNiM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729607AbfBDKjJ (ORCPT ); Mon, 4 Feb 2019 05:39:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:37032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729623AbfBDKjJ (ORCPT ); Mon, 4 Feb 2019 05:39:09 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 1EA3F2070C; Mon, 4 Feb 2019 10:39:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549276748; bh=ZXOWAUIxAvWXy4Qgcsp+7DnjRvlcLInpELns/YW2+mg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xxMPVAHNQjNloGFuSbSBTq0TVxmnZhl3gwRwKw2dqngwV2ZQY1rRo4qTAzPxiOaVm bBzy/IgNyTosm3xB6mTCMj1xFLgsVds8qgMIhPEXG4dthobAFCo9kksuFtMPBc05be mwF1abfuO6jl7W3Xp7R+CBrIcp0TRf8m1VAi4CBA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, James Morse , Will Deacon Subject: [PATCH 3.18 26/31] arm64: hyp-stub: Forbid kprobing of the hyp-stub Date: Mon, 4 Feb 2019 11:36:41 +0100 Message-Id: <20190204103603.351476803@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204103557.903263774@linuxfoundation.org> References: <20190204103557.903263774@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: James Morse commit 8fac5cbdfe0f01254d9d265c6aa1a95f94f58595 upstream. The hyp-stub is loaded by the kernel's early startup code at EL2 during boot, before KVM takes ownership later. The hyp-stub's text is part of the regular kernel text, meaning it can be kprobed. A breakpoint in the hyp-stub causes the CPU to spin in el2_sync_invalid. Add it to the __hyp_text. Signed-off-by: James Morse Cc: stable@vger.kernel.org Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/hyp-stub.S | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/arm64/kernel/hyp-stub.S +++ b/arch/arm64/kernel/hyp-stub.S @@ -26,6 +26,8 @@ #include .text + .pushsection .hyp.text, "ax" + .align 11 ENTRY(__hyp_stub_vectors)