From: Chen Gang <gchen@xxxxxxxxxxxxxxx> At present, kvm_arch_create_vm_debugfs is a new interface for arch, and it assumes return an none-zero error code, so the caller need check it and return it to the user mode. Signed-off-by: Chen Gang <gchen@xxxxxxxxxxxxxxx> --- virt/kvm/kvm_main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index d8a1a17bcb7e..b2de428bd4c7 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1015,7 +1015,7 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, int fd) ret = kvm_arch_create_vm_debugfs(kvm); if (ret) { kvm_destroy_vm_debugfs(kvm); - return i; + return ret; } return 0; @@ -4727,7 +4727,7 @@ EXPORT_SYMBOL_GPL(file_is_kvm); static int kvm_dev_ioctl_create_vm(unsigned long type) { - int r; + int r, ret; struct kvm *kvm; struct file *file; @@ -4759,10 +4759,11 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) * cases it will be called by the final fput(file) and will take * care of doing kvm_put_kvm(kvm). */ - if (kvm_create_vm_debugfs(kvm, r) < 0) { + ret = kvm_create_vm_debugfs(kvm, r); + if (ret) { put_unused_fd(r); fput(file); - return -ENOMEM; + return ret; } kvm_uevent_notify_change(KVM_EVENT_CREATE_VM, kvm); -- 2.24.0.308.g228f53135a