From patchwork Mon Oct 24 11:30:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8495 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp403946wru; Mon, 24 Oct 2022 04:53:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6qx+qYvobgRuw0jyQXFw2U5EQEBAh33YR7NK8WsWo3Skm9yXHYgEd9Fp5XWq3irancKtR6 X-Received: by 2002:a65:6e0e:0:b0:434:59e0:27d3 with SMTP id bd14-20020a656e0e000000b0043459e027d3mr27062865pgb.185.1666612433769; Mon, 24 Oct 2022 04:53:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612433; cv=none; d=google.com; s=arc-20160816; b=zFMgM536sywpN25Sklq5iFbA6jDfWKhzdsh+AejPJveaPV1vmaWMJsH+PyQdFIOB7n QKW1No5VwCFEOkdA2RsDtCSUDbQO9EWr+CHVZ3rKoQjPS0233QYQJL9/YPK/SEtTIIR1 fs9qr+hi45JX2+p3S+LawZn89xGQliJlCFvXE3Lra595ZPH9Uw07bVC+Oztc9Rbyfy4q nFm8NdRQ9OR6A8ZhF0wpT4VT0ewPaSZIQjY18S5Wuw5Ik1yEosDu3k7lIKd1S3kXkxnq nRMGdnjAhRIJs/V2vd443KYmvM37OX0iQRYi7jvmwlhTDzMEW/FlXK+x8qp6jlekG6wT eFpA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0HbWFCRwWyhCBco71WEIe8buK58+jZx3rEUyHLMb/gk=; b=VrEokydyge2ml/xpjJWgnefZY2S5pCl2ygmcUlfei7flhtEHcEumBcQI25eTsGJAF9 pUsH1oQqH3L5+MLb2PfZwYt10sGCbtu+0wjcqx6CK0ZX+BErj0bhssHoJPLANPzsb6Sv UqImyclgXX0IbDdpp3UEid8/nbztkiL3lft4VYeLqQSJbfVZegLu34YRZWZ5gOpfKuzx dni4dxVvL+T/qv2eo6/scJvKdkiWL7r1+u+bw4nkjg6Zz2KNXZgiaYINPRoo2ZfNOl7c BfkYlGNAwWvw/L6ZXEOz+P/x/h9guDHXm/4gOWP5qiMcxNXr7Uf1Lv4ErYsB/PnEEO4r qMEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SUIeEzcB; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s200-20020a632cd1000000b0042ff6b15129si32609881pgs.2.2022.10.24.04.53.41; Mon, 24 Oct 2022 04:53:53 -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=@linuxfoundation.org header.s=korg header.b=SUIeEzcB; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232105AbiJXLxW (ORCPT + 99 others); Mon, 24 Oct 2022 07:53:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232054AbiJXLwr (ORCPT ); Mon, 24 Oct 2022 07:52:47 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 757AC140D1; Mon, 24 Oct 2022 04:44:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 5DE38CE1331; Mon, 24 Oct 2022 11:40:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B31AC433D6; Mon, 24 Oct 2022 11:40:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611657; bh=pS5WP/5RnEfDdJOQcfOSKRNblYIG0koFCLEF4yVIa44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SUIeEzcB+TygSa55iKR8/Z/zeBgrEPL+nPX9/SIy/4pIYbHyA+oOi/nF1lLdMmqFs q0yMrHr2PwLTK9GP0wBaVWDTMLZgpZccS/YrG8tWi4AulZYFVW0mMvDh6KkmjO7V0Q 0ZIw+Hyi8D5eYxOC6B7CXhg7x9TCgIgPIBqCHfiU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michal Luczaj , Sean Christopherson Subject: [PATCH 4.9 062/159] KVM: x86/emulator: Fix handing of POP SS to correctly set interruptibility Date: Mon, 24 Oct 2022 13:30:16 +0200 Message-Id: <20221024112951.717779337@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747569799308892964?= X-GMAIL-MSGID: =?utf-8?q?1747569799308892964?= From: Michal Luczaj commit 6aa5c47c351b22c21205c87977c84809cd015fcf upstream. The emulator checks the wrong variable while setting the CPU interruptibility state, the target segment is embedded in the instruction opcode, not the ModR/M register. Fix the condition. Signed-off-by: Michal Luczaj Fixes: a5457e7bcf9a ("KVM: emulate: POP SS triggers a MOV SS shadow too") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/all/20220821215900.1419215-1-mhal@rbox.co Signed-off-by: Sean Christopherson Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/emulate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -1980,7 +1980,7 @@ static int em_pop_sreg(struct x86_emulat if (rc != X86EMUL_CONTINUE) return rc; - if (ctxt->modrm_reg == VCPU_SREG_SS) + if (seg == VCPU_SREG_SS) ctxt->interruptibility = KVM_X86_SHADOW_INT_MOV_SS; if (ctxt->op_bytes > 2) rsp_increment(ctxt, ctxt->op_bytes - 2);