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=-19.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 28B3FC433DB for ; Wed, 10 Feb 2021 02:41:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAD9664DAD for ; Wed, 10 Feb 2021 02:41:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235370AbhBJCku (ORCPT ); Tue, 9 Feb 2021 21:40:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:34668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235215AbhBJCgd (ORCPT ); Tue, 9 Feb 2021 21:36:33 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6558764E54; Wed, 10 Feb 2021 02:33:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612924438; bh=tlPT8X7xAkYg1opwobqkix010pmIi/FLQNl8ZjxRVwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V7Nn6v9S1Opl8gp3wEZChxdGLXIq9LwEE3rxmXG/tsaK2FJprcwSsvY7y4l7kbs// uyHkXY/OwNPL2QWzFtwPX8uXjXkvRLcLXU5oRbv/1/Fzxe9I0TqKJVXDOf0wOPOjob 5poUdKVVTBWiHryfRNwE9MQnTkRwe4JxPY6s/QJlkRgzjGiV+loQ/jH9Pvaf7EneZS krjqDRScte6l4pSMnlBZvTbiCNUGy+EG/ZKDG9ax8b0+cJBHmT61v2cXP+e9KwHFOT xo21PjlcDZu2Z+Tdc1RTvjEvZ94eGV8TNoRcqDg7aq51w8aivxbo/erUbvTeWXFc2J kjvqJ6X2FKjKg== From: Andy Lutomirski To: x86@kernel.org Cc: LKML , Dave Hansen , Alexei Starovoitov , Daniel Borkmann , Yonghong Song , Masami Hiramatsu , Andy Lutomirski , Peter Zijlstra Subject: [PATCH v2 12/14] x86/fault: Don't look for extable entries for SMEP violations Date: Tue, 9 Feb 2021 18:33:44 -0800 Message-Id: <46160d8babce2abf1d6daa052146002efa24ac56.1612924255.git.luto@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If we get a SMEP violation or a fault that would have been a SMEP violation if we had SMEP, we shouldn't run fixups. Just OOPS. Cc: Dave Hansen Cc: Peter Zijlstra Signed-off-by: Andy Lutomirski --- arch/x86/mm/fault.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 9fb636b2a3da..466415bdf58c 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1249,12 +1249,12 @@ void do_user_addr_fault(struct pt_regs *regs, * user memory. Unless this is AMD erratum #93, which * corrupts RIP such that it looks like a user address, * this is unrecoverable. Don't even try to look up the - * VMA. + * VMA or look for extable entries. */ if (is_errata93(regs, address)) return; - bad_area_nosemaphore(regs, error_code, address); + page_fault_oops(regs, error_code, address); return; } -- 2.29.2