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.4 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,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 6D7F9C433DB for ; Sun, 31 Jan 2021 22:18:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 34B0A64E29 for ; Sun, 31 Jan 2021 22:18:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229821AbhAaWRT (ORCPT ); Sun, 31 Jan 2021 17:17:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:37108 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229753AbhAaWNV (ORCPT ); Sun, 31 Jan 2021 17:13:21 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0DBBB64E51; Sun, 31 Jan 2021 17:24:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612113895; bh=CNpgb/IqxKW9fcAp/ircjHKvncodYrH0lcqqvhfq9mg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cuAMCWLvI6AAyKW4uq+x6K+5CY6e5tMSvVy67id6ayx7XkyTJF4/nTuRzXQOoWfwm nLyPlpUE6WblH0UEl9impS/SrhJI8/6bSJlNPe90uFe/upru1ADBDLFjGd8eYtkceP iNHaFRT9ndDQnYpF5E1lUbRlXVOIi0ZAA17tjswid0BCKnsewz/eRciX75NhbxDNFA joBKjibMqurGdBAwPgpsaH1JOQAwuIu02VRxEyF26EdxOanWUyaFz5laPD8SxLT/jG fBgRda4VYdSdT1FnqF1OhdXI5o9lb25gtEmQPEd3b6rLsr9v68x46lX4lyuYZieoYl Xa+bFS8WvHNEw== 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 11/11] x86/fault: Don't look for extable entries for SMEP violations Date: Sun, 31 Jan 2021 09:24:42 -0800 Message-Id: <45fd30a3ef59733d8618fcd3736217b5edda3971.1612113550.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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index d39946ad8a91..08f5f74cf989 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1211,12 +1211,13 @@ void do_user_addr_fault(struct pt_regs *regs, /* * Whoops, this is kernel mode code trying to execute from * user memory. Unless this is AMD erratum #93, we are toast. - * Don't even try to look up the VMA. + * Don't even try to look up the 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