KVM: SVM: Fix SEV LAUNCH_SECRET command (9c5e0afa) · Commits · 戴 / test

The SEV LAUNCH_SECRET command fails with error code 'invalid param' because we missed filling the guest and header system physical address while issuing the command. Fixes: (KVM: SVM: Add support for SEV LAUNCH_SECRET command) Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Radim Krčmář <rkrcmar@redhat.com> Cc: Borislav Petkov <bp@suse.de> Cc: Tom Lendacky <thomas.lendacky@amd.com> Cc: linux-kernel@vger.kernel.org Cc: Joerg Roedel <joro@8bytes.org> Signed-off-by:

Brijesh Singh <brijesh.singh@amd.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/svm.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -6604,7 +6604,7 @@ static int sev_launch_secret(struct kvm kvm, struct kvm_sev_cmd argp)
		struct page **pages;
		void blob, hdr;
		unsigned long n;
		int ret;
		int ret, offset;

		if (!sev_guest(kvm))
		return -ENOTTY;
		@@ -6630,6 +6630,10 @@ static int sev_launch_secret(struct kvm kvm, struct kvm_sev_cmd argp)
		if (!data)
		goto e_unpin_memory;

		offset = params.guest_uaddr & (PAGE_SIZE - 1);
		data->guest_address = __sme_page_pa(pages[0]) + offset;
		data->guest_len = params.guest_len;

		blob = psp_copy_user_blob(params.trans_uaddr, params.trans_len);
		if (IS_ERR(blob)) {
		ret = PTR_ERR(blob);
		@@ -6644,8 +6648,8 @@ static int sev_launch_secret(struct kvm kvm, struct kvm_sev_cmd argp)
		ret = PTR_ERR(hdr);
		goto e_free_blob;
		}
		data->trans_address = __psp_pa(blob);
		data->trans_len = params.trans_len;
		data->hdr_address = __psp_pa(hdr);
		data->hdr_len = params.hdr_len;

		data->handle = sev->handle;
		ret = sev_issue_cmd(kvm, SEV_CMD_LAUNCH_UPDATE_SECRET, data, &argp->error);

Admin message