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.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 09FECC3A5A3 for ; Tue, 27 Aug 2019 12:28:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DDA3C2070B for ; Tue, 27 Aug 2019 12:28:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726539AbfH0M2M (ORCPT ); Tue, 27 Aug 2019 08:28:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59508 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726140AbfH0M2M (ORCPT ); Tue, 27 Aug 2019 08:28:12 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2A8EB19CF26 for ; Tue, 27 Aug 2019 12:28:12 +0000 (UTC) Received: by mail-wr1-f69.google.com with SMTP id w11so11329630wru.17 for ; Tue, 27 Aug 2019 05:28:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=/Q0E+7BYMqeSKrr8rrbLIrnvEziyebT5UAawMArD2vA=; b=dX6VBS7kn8RHnO86Ra0Rih5UFf3E7z0dw3cwAbgI2X4rwZ58N4blrXfl9ry0hBa+y9 BcFPYA3rP+MbmAm3M0qzWZjT8zXyD8aCNnWOPsQIdyy1dB4W6Dp67gKg+BMPp5T179/h CrDKBwtuqjLOi6mHdeg3KLfRF1TJE/q8EvLoSrkU5SkDxr/J6Ujz92HZYzclaITIaFmA a39aZ5S7n1t4RETDBfS+OqRlIBgk+BCD76CiVQSie7zj2TFVod0735hbrjFyFlrAlfan DBbXgV2VR78kP5jvdv58rn3OluTch5+vCqpEAgsuleleBwY+IFdoJ7h4mnQzuEa4z+yC hpKg== X-Gm-Message-State: APjAAAUm37EZ1R5qtV9j3OwBFnx56RYzYi+HCI3Gi4vKmZzvoD/UDSmi kP/aoLQOQo5LIP3fzW3/mH3Jysah9RR5/mkljcvx/kMMkkB4TSqvH/ilCaqNCSq08Ut96fPoZoo 8Jmrl8/ek0AuB X-Received: by 2002:adf:d187:: with SMTP id v7mr6382612wrc.33.1566908890793; Tue, 27 Aug 2019 05:28:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqwA+4Ie02Oy9bFLyljo1OWGlyEeQPD6lPKKcFhAUegYtJfvEJDgLnQHVy2ReGyaTzUzjUQBPg== X-Received: by 2002:adf:d187:: with SMTP id v7mr6382567wrc.33.1566908890575; Tue, 27 Aug 2019 05:28:10 -0700 (PDT) Received: from vitty.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id l14sm19944936wrn.42.2019.08.27.05.28.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2019 05:28:09 -0700 (PDT) From: Vitaly Kuznetsov To: Dan Carpenter , Paolo Bonzini Cc: Radim =?utf-8?B?S3LEjW3DocWZ?= , Sean Christopherson , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, kvm@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] x86: KVM: svm: Fix a check in nested_svm_vmrun() In-Reply-To: <20190827093852.GA8443@mwanda> References: <20190827093852.GA8443@mwanda> Date: Tue, 27 Aug 2019 14:28:09 +0200 Message-ID: <871rx6n67a.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Dan Carpenter writes: > We refactored this code a bit and accidentally deleted the "-" character > from "-EINVAL". The kvm_vcpu_map() function never returns positive > EINVAL. > > Fixes: c8e16b78c614 ("x86: KVM: svm: eliminate hardcoded RIP advancement from vmrun_interception()") > Signed-off-by: Dan Carpenter > --- > From static analysis. I don't really know the impact. > > > arch/x86/kvm/svm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c > index 1f220a85514f..ef646e22d1ab 100644 > --- a/arch/x86/kvm/svm.c > +++ b/arch/x86/kvm/svm.c > @@ -3598,7 +3598,7 @@ static int nested_svm_vmrun(struct vcpu_svm *svm) > vmcb_gpa = svm->vmcb->save.rax; > > ret = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb_gpa), &map); > - if (ret == EINVAL) { > + if (ret == -EINVAL) { > kvm_inject_gp(&svm->vcpu, 0); > return 1; > } else if (ret) { I was hoping that my patch was OK and Paolo screwed it upon commit but no, it's the same in my local branch and I'm left without excuses :-) Reviewed-by: Vitaly Kuznetsov -- Vitaly