KVM: SVM: Replace kzalloc() + copy_from_user() with memdup_user()
PATCH 1/1 KVM: SVM: Replace kzalloc() + copy_from_user() with memdup_user()
Replace kzalloc() followed by copy_from_user() with memdup_user() to improve and simplify svm_set_nested_state().
Return early if an error occurs instead of trying to allocate memory for 'save' when memory allocation for 'ctl' already failed.
Signed-off-by Thorsten Blum <[email protected]>
--- arch/x86/kvm/svm/nested.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
arch/x86/kvm/svm/nested.c +9 -11
@@ -1798,17 +1798,15 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,if (kvm_state->size <sizeof (*kvm_state) +KVM_STATE_NESTED_SVM_VMCB_SIZE )return -EINVAL ; - ret = -ENOMEM ; - ctl =kzalloc (sizeof (*ctl),GFP_KERNEL ); - save =kzalloc (sizeof (*save),GFP_KERNEL ); -if (!ctl || !save) - goto out_free; - - ret = -EFAULT ; -if (copy_from_user (ctl, &user_vmcb->control,sizeof (*ctl))) - goto out_free; -if (copy_from_user (save, &user_vmcb->save,sizeof (*save))) - goto out_free; + ctl =memdup_user (&user_vmcb->control,sizeof (*ctl)); +if (IS_ERR (ctl)) +return PTR_ERR (ctl); + + save =memdup_user (&user_vmcb->save,sizeof (*save)); +if (IS_ERR (save)) { +kfree (ctl); +return PTR_ERR (save); + } ret = -EINVAL ;__nested_copy_vmcb_control_to_cache (vcpu, &ctl_cached, ctl);
Signature · 1 line
2.51.0
Quoted 8 lines · Thorsten Blum
Replace
kzalloc()followed bycopy_from_user()withmemdup_user()to improve and simplifysvm_set_nested_state().Return early if an error occurs instead of trying to allocate memory for 'save' when memory allocation for 'ctl' already failed.
[...]
Applied to kvm-x86 svm, thanks!
[1/1] KVM: SVM: Replace kzalloc() + copy_from_user() with memdup_user()
https://github.com/kvm-x86/linux/commit/fc55b4cda00a