KVM: x86: Fix uninitialized return value bug in EXIT_HYPERCALL enabling
Sean Christopherson
maintainerPATCH 1/1 KVM: x86: Fix uninitialized return value bug in EXIT_HYPERCALL enabling
Zero out 'r' on success in the KVM_CAP_EXIT_HYPERCALL case. As noted by clang, the happy path will return an uninitialized value:
arch/x86/kvm/x86.c:5649:7: error: variable 'r' is used uninitialized
whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
if (cap->args[0] & ~KVM_EXIT_HYPERCALL_VALID_MASK) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/x86/kvm/x86.c:5663:9: note: uninitialized use occurs here
return r;
^
arch/x86/kvm/x86.c:5649:3: note: remove the 'if' if its condition is always true
if (cap->args[0] & ~KVM_EXIT_HYPERCALL_VALID_MASK) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/x86/kvm/x86.c:5540:7: note: initialize the variable 'r' to silence this warning
int r;
^
= 0Opportunistically move the "r = -EINVAL;" above the check to match the pattern used in almost all other cases.
--- arch/x86/kvm/x86.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/kvm/x86.c +4 -3
@@ -5646,11 +5646,12 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, r = kvm_x86_ops.vm_copy_enc_context_from (kvm, cap->args[0 ]);return r;case KVM_CAP_EXIT_HYPERCALL : -if (cap->args[0 ] & ~KVM_EXIT_HYPERCALL_VALID_MASK ) { - r = -EINVAL ; + r = -EINVAL ; +if (cap->args[0 ] & ~KVM_EXIT_HYPERCALL_VALID_MASK )break ; - } + kvm->arch.hypercall_exit_enabled = cap->args[0 ]; + r =0 ;break ;case KVM_CAP_EXIT_ON_EMULATION_FAILURE : kvm->arch.exit_on_emulation_error = cap->args[0 ];
Signature · 1 line
2.32.0.93.g670b81a890-goog
Paolo Bonzini
maintainerQuoted 18 lines · Sean Christopherson
Zero out 'r' on success in the
KVM_CAP_EXIT_HYPERCALLcase. As noted by clang, the happy path will return an uninitialized value:arch/x86/kvm/x86.c:5649:7: error: variable 'r' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] if (cap->args[0] & ~KVM_EXIT_HYPERCALL_VALID_MASK) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/x86/kvm/x86.c:5663:9: note: uninitialized use occurs here return r; ^ arch/x86/kvm/x86.c:5649:3: note: remove the 'if' if its condition is always true if (cap->args[0] & ~KVM_EXIT_HYPERCALL_VALID_MASK) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/x86/kvm/x86.c:5540:7: note: initialize the variable 'r' to silence this warning int r; ^ = 0
Quoted 5 lines
Opportunistically move the "r =
-EINVAL;" above the check to match the pattern used in almost all other cases.Fixes 0dbb11230437 ("KVM: X86: Introduce KVM_HC_MAP_GPA_RANGE hypercall")Signed-off-by Sean Christopherson <[email protected]>
Actually it was not that patch, but rather a botched conflict resolution when applying (too late at night) Aaron's emulation failure patch:
@@ -5647,6 +5648,9 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm,
break;
}
kvm->arch.hypercall_exit_enabled = cap->args[0];
+ break;
+ case KVM_CAP_EXIT_ON_EMULATION_FAILURE:
+ kvm->arch.exit_on_emulation_error = cap->args[0];
r = 0;
break;
default:I have already fixed this locally, though I haven't pushed it to kvm.git yet; my tests should finish running in about an hour, and then I'll push everything to kvm/next, except for the C bit fixes.
Paolo
Quoted 25 lines
--- arch/x86/kvm/x86.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)arch/x86/kvm/x86.c +4
-3@@ -5646,11 +5646,12 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, r = kvm_x86_ops.vm_copy_enc_context_from (kvm, cap->args[0 ]);return r;case KVM_CAP_EXIT_HYPERCALL : -if (cap->args[0 ] & ~KVM_EXIT_HYPERCALL_VALID_MASK ) { - r = -EINVAL ; + r = -EINVAL ; +if (cap->args[0 ] & ~KVM_EXIT_HYPERCALL_VALID_MASK )break ; - } + kvm->arch.hypercall_exit_enabled = cap->args[0 ]; + r =0 ;break ;case KVM_CAP_EXIT_ON_EMULATION_FAILURE : kvm->arch.exit_on_emulation_error = cap->args[0 ];
Quoted 4 lines · Paolo Bonzini
I have already fixed this locally, though I haven't pushed it to kvm.git yet; my tests should finish running in about an hour, and then I'll push everything to kvm/next, except for the C bit fixes.
Ah, I was looking at this case in linux-next, and 0dbb11230437895f7cd6fc55da61cef011e997d8 wondering what was going on!
Signature · 2 lines
Thanks, ~Nick Desaulniers
Sean Christopherson
maintainerQuoted 8 lines · Nick Desaulniers
Quoted 4 lines · Paolo Bonzini
I have already fixed this locally, though I haven't pushed it to kvm.git yet; my tests should finish running in about an hour, and then I'll push everything to kvm/next, except for the C bit fixes.
Ah, I was looking at this case in linux-next, and
0dbb11230437895f7cd6fc55da61cef011e997d8wondering what was going on!
Doh, I obviously didn't look too closely at the blame.