Message ID | 20230721161018.50214-6-brgerst@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp339215vqg; Fri, 21 Jul 2023 09:58:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlGkD4OFNeiZmKI4zxH6mVUuHnjlGoypkSUojXwWnUuFLPA8/+yF5AcMwTnCjSdyXgJTjzpG X-Received: by 2002:a17:907:3e1c:b0:992:74e0:6f76 with SMTP id hp28-20020a1709073e1c00b0099274e06f76mr9871105ejc.4.1689958723261; Fri, 21 Jul 2023 09:58:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689958723; cv=none; d=google.com; s=arc-20160816; b=cglUtEnY6VKPcp0G6j38Osdnec9+Q1Myd3s53wvo484pF/PAf/VE3BIzX78hbh3AFf /E62DuwfmvBit9LW8VBI+ukh8GW/lsNJf5tnorQmeIuwBUSPy6FJajnR096pZOpKRkTh STSdrd5TEuyj0djEEvda43Jm8Zz9wjA0w1p5D8LwQDAYnhfrUVvq4Pp2CB4jlMT3f0LQ tdQRGBfJj9paPf10eaB8oNoE7Zz7gnivoom80RcPys4niRagCmjRA8CRSFbEOEtm8Y2+ BM9ZHGRT+bGoCC72XB7xW+PBUw+lc0o00EyKeFgeu+hVC11//St0Id6WgT+rRz95Kzur ITIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tfQVUJeG82Bn7jUnxAG1fPc5fzriqyrGkxLsws2Rhtc=; fh=7RNrRNWUj9CYv4UOvP3YqAuBAxHO0RPePKHqIO87VRQ=; b=QxOfz1dMCS+ZVooFzy24eqcV731rdHLIvCPK/X+GM4QTqzkcpw5ickvRuiNJ5E6EWn iATFJID4ZD3mxrcTpovsnDAnE1FwjJd+H5ZQuUp76mA1J7MvQ6nTQu+eXXhhL0AtcQQM /EtcR24Hv5koOdmbNlEkfBSUAUFYrJrxipVUJyrQM9gvjgCs3mLSbYX4fw8c6JkaZe/h ZQ3wFPIhbCgokoTdqHpy1sbSWJYhmG0HUsvbB3jX2PbROhUV6pv43cB5T2TN5C02GtUI 6z/EPTqcjCnaesaK2sZEBU2rhqRwCyGfLt8ronvuelYYr2zT5I3G7eI0SMNHyeYO4xUC fIrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="FlKm/uhn"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j17-20020a1709062a1100b00992b32e3e3esi2457621eje.468.2023.07.21.09.58.19; Fri, 21 Jul 2023 09:58:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="FlKm/uhn"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231441AbjGUQLL (ORCPT <rfc822;assdfgzxcv4@gmail.com> + 99 others); Fri, 21 Jul 2023 12:11:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232045AbjGUQKx (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 21 Jul 2023 12:10:53 -0400 Received: from mail-qt1-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B721A3586 for <linux-kernel@vger.kernel.org>; Fri, 21 Jul 2023 09:10:48 -0700 (PDT) Received: by mail-qt1-x832.google.com with SMTP id d75a77b69052e-403b6b7c0f7so17586451cf.0 for <linux-kernel@vger.kernel.org>; Fri, 21 Jul 2023 09:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689955847; x=1690560647; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tfQVUJeG82Bn7jUnxAG1fPc5fzriqyrGkxLsws2Rhtc=; b=FlKm/uhne4Q4zTBXZJj8mnli3+gsAwYvEmHxdunziS1nhM8Jnq8CdAZ0Au0Nzz/yyn /YHyemgMxFP6flT3BtZFWRTTY8Eex1vmcgHxQKDK0GaR/rj2ZApZqXL8Nb47PnGjwwQ+ bFT/4aGMrzFY/owB+fbsGAGNv0U7XutlcKB5l/4xCfIi76irlQ06ep07BSr19VJmVUwo 94RMHoBS95r3F/osFB8YsBoxMuI2SVil/EWQ+EkSmBGY8CkfXU0Ihv3cXwv826o8QNce omi4F2eopr0YfPZe/jH5a9WyKTxkUw3rfsLFdKE+YuYuT74j8bmohPGeqnO9tDnAdNGZ T0ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689955847; x=1690560647; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tfQVUJeG82Bn7jUnxAG1fPc5fzriqyrGkxLsws2Rhtc=; b=TCBYZFS6routxJUm39EWxWqoU34tmOnVBPEqnVgHA2WksL4a436L7AwvBmtjUOdS3c zUqenU94DRw22oFWcBmXJ8s0R0RtNqwTr0PyWYR3FKOHcN0Z/NP2iO9PsQ+3Tz4RDZoo jQcvth9HyakupBWScnj0IJ/yBn7PXuRV9MIKONBfaUgB7/ICyrkfJGzksmM36npRhkkY lEjJNDCWNdnQPdso1NWOIuBvuLk+OqlqGtAOQn5AEsQR1QNn+qfzIW2BdfbxcmvLrJzP F4MXh0UGfDnWyYRyMDbpHxqCk1ztFpZYn5kprlCmt/IHIcWX8KKvrx8JqYZ31emn8aAv TpkQ== X-Gm-Message-State: ABy/qLZaNrUhy2Co+CDkVn0lH/VKLbCLGumq3k+lq/dqCEcEqZgXd4bE mO9m+s0WLX8QQYdnDjoqUjM8f5uDgA== X-Received: by 2002:a05:622a:190a:b0:403:6fe6:3160 with SMTP id w10-20020a05622a190a00b004036fe63160mr619325qtc.61.1689955847108; Fri, 21 Jul 2023 09:10:47 -0700 (PDT) Received: from citadel.. (047-026-243-217.res.spectrum.com. [47.26.243.217]) by smtp.gmail.com with ESMTPSA id c16-20020ac87d90000000b004054fbf9273sm311286qtd.80.2023.07.21.09.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 09:10:46 -0700 (PDT) From: Brian Gerst <brgerst@gmail.com> To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Thomas Gleixner <tglx@linutronix.de>, Borislav Petkov <bp@alien8.de>, "H . Peter Anvin" <hpa@zytor.com>, Andy Lutomirski <luto@kernel.org>, =?utf-8?q?Mika_Penttil=C3=A4?= <mpenttil@redhat.com>, Brian Gerst <brgerst@gmail.com> Subject: [PATCH v2 5/6] x86/entry/32: Remove SEP test for SYSEXIT Date: Fri, 21 Jul 2023 12:10:16 -0400 Message-ID: <20230721161018.50214-6-brgerst@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230721161018.50214-1-brgerst@gmail.com> References: <20230721161018.50214-1-brgerst@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772050158428104356 X-GMAIL-MSGID: 1772050158428104356 |
Series |
x86: Clean up fast syscall return validation
|
|
Commit Message
Brian Gerst
July 21, 2023, 4:10 p.m. UTC
SEP must be already be present in order for do_fast_syscall_32() to be
called on native 32-bit, so checking it again is unnecessary.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/entry/common.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 5b3594457af3..4d7d6d25dda9 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -265,8 +265,7 @@ __visible noinstr bool do_fast_syscall_32(struct pt_regs *regs) * We don't allow syscalls at all from VM86 mode, but we still * need to check VM, because we might be returning from sys_vm86. */ - return static_cpu_has(X86_FEATURE_SEP) && - regs->cs == __USER_CS && regs->ss == __USER_DS && + return regs->cs == __USER_CS && regs->ss == __USER_DS && regs->ip == landing_pad && (regs->flags & (X86_EFLAGS_RF | X86_EFLAGS_TF | X86_EFLAGS_VM)) == 0; #endif