KVM: SVM: Fix SEV SEND_START session length & SEND_UPDATE_DATA query length after commit 238eca821cee
PATCH 1/1 KVM: SVM: Fix SEV SEND_START session length & SEND_UPDATE_DATA query length after commit 238eca821cee
From: Ashish Kalra <[email protected]>
Commit 238eca821cee ("KVM: SVM: Allocate SEV command structures on local stack") uses the local stack to allocate the structures used to communicate with the PSP, which were earlier being kzalloced. This breaks SEV live migration for computing the SEND_START session length and SEND_UPDATE_DATA query length as session_len and trans_len and hdr_len fields are not zeroed respectively for the above commands before issuing the SEV Firmware API call, hence the firmware returns incorrect session length and update data header or trans length.
Also the SEV Firmware API returns SEV_RET_INVALID_LEN firmware error for these length query API calls, and the return value and the firmware error needs to be passed to the userspace as it is, so need to remove the return check in the KVM code.
--- arch/x86/kvm/svm/sev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/kvm/svm/sev.c +2 -4
@@ -1103,10 +1103,9 @@ __sev_send_start_query_session_length(struct kvm *kvm, struct kvm_sev_cmd *argp,struct sev_data_send_start data;int ret; +memset (&data,0 ,sizeof (data)); data.handle = sev->handle; ret =sev_issue_cmd (kvm,SEV_CMD_SEND_START , &data, &argp->error); -if (ret <0 ) -return ret; params->session_len = data.session_len; if (copy_to_user((void __user *)(uintptr_t)argp->data, params,
@@ -1215,10 +1214,9 @@ __sev_send_update_data_query_lengths(struct kvm *kvm, struct kvm_sev_cmd *argp,struct sev_data_send_update_data data;int ret; +memset (&data,0 ,sizeof (data)); data.handle = sev->handle; ret =sev_issue_cmd (kvm,SEV_CMD_SEND_UPDATE_DATA , &data, &argp->error); -if (ret <0 ) -return ret; params->hdr_len = data.hdr_len; params->trans_len = data.trans_len;
Signature · 1 line
2.17.1
Quoted 39 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
Commit
238eca821cee("KVM: SVM: Allocate SEV command structures on local stack") uses the local stack to allocate the structures used to communicate with the PSP, which were earlier being kzalloced. This breaks SEV live migration for computing theSEND_STARTsession length andSEND_UPDATE_DATAquery length assession_lenandtrans_lenandhdr_lenfields are not zeroed respectively for the above commands before issuing the SEV Firmware API call, hence the firmware returns incorrect session length and update data header or trans length.Also the SEV Firmware API returns
SEV_RET_INVALID_LENfirmware error for these length query API calls, and the return value and the firmware error needs to be passed to the userspace as it is, so need to remove the return check in the KVM code.Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/kvm/svm/sev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)arch/x86/kvm/svm/sev.c +1
-2@@ -1103,10 +1103,9 @@ __sev_send_start_query_session_length(struct kvm *kvm, struct kvm_sev_cmd *argp,struct sev_data_send_start data;int ret; +memset (&data,0 ,sizeof (data)); data.handle = sev->handle; ret =sev_issue_cmd (kvm,SEV_CMD_SEND_START , &data, &argp->error); -if (ret <0 ) -return ret; params->session_len = data.session_len; if (copy_to_user((void __user *)(uintptr_t)argp->data, params,@@ -1215,10 +1214,9 @@ __sev_send_update_data_query_lengths(struct kvm *kvm, struct kvm_sev_cmd *argp,struct sev_data_send_update_data data;
arch/x86/kvm/svm/sev.c __sev_send_update_data_query_lengths(struct kvm *kvm, struct kvm_sev_cmd *argp, · line 1222
Quoted 10 lines
arch/x86/kvm/svm/sev.c +1
-2int ret; +memset (&data,0 ,sizeof (data)); data.handle = sev->handle; ret =sev_issue_cmd (kvm,SEV_CMD_SEND_UPDATE_DATA , &data, &argp->error); -if (ret <0 ) -return ret; params->hdr_len = data.hdr_len; params->trans_len = data.trans_len;
Queued, thanks.
Paolo