From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D019446AF3F for ; Fri, 29 May 2026 18:36:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780079821; cv=none; b=Bi/RFch0CdQ67IMKRu/Jjrofc966Mxnw1UX4siEtjil8deX/lx5QnQenKbvC71N/ZgvKEe3pOkqkbN1fchVP8AOBDmBxWXRd6fQ6BxLNYDqxChe/jsPjxEuVcGcJi4iJ9Ip6MEYgXZJQEFxmvCCRSrHAC62moae81qFdYW4A5CY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780079821; c=relaxed/simple; bh=cLlmujmrIgemvQsPSTY1GTNh15IlTa3nEz3RTFfzlBU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pwmusjOV/PGXHpXbxxwEBsL6qmV8ck3Y/JKFly8YofSf47Ehh6gGQw1WldH1+doE/GEQaad6SzjaaBn0IfjI1hNHCW3EGRCO6bPihJW5WPKGIQtRrDmsRCwARkW5PI+m3d2/QQHIPx4fIH6WxUKI3qAUEE9z5RNUmvbOjkNbK0M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=YpNISdGJ; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=AkJwmpoO; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YpNISdGJ"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="AkJwmpoO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780079816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aP7hMfcyuwDfmzm6MvxteCiSc9hEWi4a0ARiKg8JNrs=; b=YpNISdGJoiaeLUxRUz8pFvYSxDuSp2ZidOCXB0JJHl3Hc2jjvV3U5xMzt6ZbTODMFDXOyN uZMtTpS/Xim2WYH81znSHgfvQy/wLa6uyI2nuVvgIIqhaMMSq7avYULCbB+sXwomqmowiy FnIVo69T8pAdmqgGj4ocUb7hprgVRzc= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-17-zuxwNBH0NJqsKa2eiUGm3A-1; Fri, 29 May 2026 14:36:52 -0400 X-MC-Unique: zuxwNBH0NJqsKa2eiUGm3A-1 X-Mimecast-MFC-AGG-ID: zuxwNBH0NJqsKa2eiUGm3A_1780079811 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-49058e91639so47817945e9.3 for ; Fri, 29 May 2026 11:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1780079811; x=1780684611; darn=vger.kernel.org; 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=aP7hMfcyuwDfmzm6MvxteCiSc9hEWi4a0ARiKg8JNrs=; b=AkJwmpoOPc357MHSF49AtL95SF0S0jLsrcFBHnyP/WmNW6INEvKQ78PlIu6NdCDq6l U1ClyiJZuY8Dhzy9T95VyfceWwPwqusUZPvSwNQUjAYHwgdcxFGGkxqxdK/13mSyy7Lv e7kkIiosnlzDDuCELvODCsOZvPP/c4GwKtJbFywpWbHUGabwnta6VXhAsqBIfiMZvSDk yPFzv8Pmg6SaDK70+tLXDKxzwcLw4H8n7cB0hl7vS+09pWPKoI+6HsUeiLe6e6ki+A1p l1BufiTKoCnmZHvdcsLJtMPqTWvEfn3JTeIQwC2+8eNpouULAg3z4V/u4O5KgbXhBAX0 pWcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780079811; x=1780684611; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=aP7hMfcyuwDfmzm6MvxteCiSc9hEWi4a0ARiKg8JNrs=; b=PegQf7ub7gZ8AWgyTQ7IvbFPA5G+Ed7xBz3q5qWmmCd0mRp9Ll7RZVMWgVE9a+HWQ+ Kn4j4S7wNpoVz+BhALZ/BoP2mXiIpXGAEVIg/BVf8KFGTh/1A3geTc1u4rYGtP/mfBaE T9YKx2iuAyrAH1JTOvukqVr2YqD+bDINdQlCOY7IDq0IQYIDNMHuSlLTj7iuzs9vUk/T Xi7XmXembI7YuBIo/zvEe6IF8D3KSRLYJ/QT/Xb9FB7wvTeb368LEPhi1P/wCl03VmwW 64vmKokcBVKaNcrNu3Eje4zI5asWAB6Kon0esHohIZtt/4sg90e1zi7hBoui9dRleqR7 vrSw== X-Gm-Message-State: AOJu0Yzj9X+pGYd3dgIV6ZDbX46O0xWmKoVzobhlrKcySVk/Udu0AA6y PBFpIMCy5mkB5MLp5vOfKa3WwABcOyDsfgxr0pY21Jwlwsm7PKAFj3C4GKrnPpSQbPFE0vG588Q LlArbiTTxBJCV4887EN+fJATgr4KWDhOuBrCpYOaaW1AIFLsA924L1lpD2tQB5MmnZGBjJxwYDR iDDyVh3B2bhuATHElp51XsYBmXUb7kLwek2sa49FILP2p55xdTDQ== X-Gm-Gg: Acq92OGS1E2uaKELYnTszxNFZIq9q9gH2P1uRNoOquPR5qRvB+nI1Ctchb8N3E7hL+A 68+2B6jMn55JLN/q4PUb9yXgQEse59wtal7HTzwXg/AdNzxgMvq/b5y0azEIbgSPe0W1ZatVZEG 5KvwiuzcUiWvCGU0Z9OOwZ+p/kxJsfl5IrMN5Eu2W0/MUNFlHfvJbFPP9UD51xaQ/O7dsELFS/T DtbjZiw4lEsHTApdqPhYteauk4+UjyKyEV3zNqIyvW83YVygemR8cjKromdszGzVcDwjZfh20Vm 4fdLvWUQHe0qNqzi+oIukZ7BdOjRQzJ+jCskm1o0N0qmTkeH0JtOH8km/tMnYKsatLiyT/IS6QK n92Jnqm4TIbjHRpPljFyoklcBo7GIy9wDsUHKaydmhRJ2E3SmMttyJkKczjr6ZY10yjd+vnqOL8 JlZB2zRXdjJQ/TEZOFu/SkNCgklNQOvwhAtmhj4Q== X-Received: by 2002:a05:600c:a00c:b0:489:1f04:96c3 with SMTP id 5b1f17b1804b1-490a2904aa4mr15849805e9.2.1780079811076; Fri, 29 May 2026 11:36:51 -0700 (PDT) X-Received: by 2002:a05:600c:a00c:b0:489:1f04:96c3 with SMTP id 5b1f17b1804b1-490a2904aa4mr15849275e9.2.1780079810665; Fri, 29 May 2026 11:36:50 -0700 (PDT) Received: from [192.168.10.48] ([151.49.251.208]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4909d6f3027sm51965255e9.14.2026.05.29.11.36.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2026 11:36:47 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, Tom Lendacky , Michael Roth Subject: [PATCH 21/24] KVM: SEV: Return INVALID_INPUT, not MISSING_INPUT, for bad GUEST_REQUEST input(s) Date: Fri, 29 May 2026 20:35:46 +0200 Message-ID: <20260529183549.1104619-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260529183549.1104619-1-pbonzini@redhat.com> References: <20260529183549.1104619-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sean Christopherson Return INVALID_INPUT, not MISSING_INPUT, if the guest provides an unaligned address for a GUEST_REQUEST, and/or attempts to use the same page for the source and destination. The inputs are obviously invalid, not missing. Opportunistically move the checks out of sev_es_validate_vmgexit(), to continue the march towards reducing the scope of the helper, and to help guide future changes into correctly handling bad input. Fixes: 88caf544c930 ("KVM: SEV: Provide support for SNP_GUEST_REQUEST NAE event") Fixes: 74458e4859d8 ("KVM: SEV: Provide support for SNP_EXTENDED_GUEST_REQUEST NAE event") Reviewed-by: Tom Lendacky Reviewed-by: Michael Roth Signed-off-by: Sean Christopherson Message-ID: <20260501202250.2115252-22-seanjc@google.com> Signed-off-by: Paolo Bonzini --- arch/x86/kvm/svm/sev.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index b59adddfdbcc..84421d9a116b 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -3508,10 +3508,6 @@ static int sev_es_validate_vmgexit(struct vcpu_svm *svm) break; case SVM_VMGEXIT_GUEST_REQUEST: case SVM_VMGEXIT_EXT_GUEST_REQUEST: - if (!PAGE_ALIGNED(control->exit_info_1) || - !PAGE_ALIGNED(control->exit_info_2) || - control->exit_info_1 == control->exit_info_2) - goto vmgexit_err; break; default: reason = GHCB_ERR_INVALID_EVENT; @@ -4631,10 +4627,20 @@ int sev_handle_vmgexit(struct kvm_vcpu *vcpu) ret = 1; break; case SVM_VMGEXIT_GUEST_REQUEST: - ret = snp_handle_guest_req(svm, control->exit_info_1, control->exit_info_2); - break; case SVM_VMGEXIT_EXT_GUEST_REQUEST: - ret = snp_handle_ext_guest_req(svm, control->exit_info_1, control->exit_info_2); + if (!PAGE_ALIGNED(control->exit_info_1) || + !PAGE_ALIGNED(control->exit_info_2) || + control->exit_info_1 == control->exit_info_2) { + svm_vmgexit_bad_input(svm, GHCB_ERR_INVALID_INPUT); + return 1; + } + + if (control->exit_code == SVM_VMGEXIT_GUEST_REQUEST) + ret = snp_handle_guest_req(svm, control->exit_info_1, + control->exit_info_2); + else + ret = snp_handle_ext_guest_req(svm, control->exit_info_1, + control->exit_info_2); break; case SVM_VMGEXIT_UNSUPPORTED_EVENT: vcpu_unimpl(vcpu, -- 2.54.0