KVM: x86: move guest_pv_has out of user_access section
Paolo Bonzini
maintainerPATCH 1/1 KVM: x86: move guest_pv_has out of user_access section
When UBSAN is enabled, the code emitted for the call to guest_pv_has includes a call to __ubsan_handle_load_invalid_value. objtool complains that this call happens with UACCESS enabled; to avoid the warning, pull the calls to user_access_begin into both arms of the "if" statement, after the check for guest_pv_has.
--- arch/x86/kvm/x86.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/kvm/x86.c +6 -3
@@ -3292,9 +3292,6 @@ static void record_steal_time(struct kvm_vcpu *vcpu) } st = (struct kvm_steal_time __user *)ghc->hva; -if (!user_access_begin (st,sizeof (*st))) -return ; -/* * Doing a TLB flush here, on the guest's behalf, can avoid * expensive IPIs.
@@ -3303,6 +3300,9 @@ static void record_steal_time(struct kvm_vcpu *vcpu)u8 st_preempted =0 ;int err = -EFAULT ; +if (!user_access_begin (st,sizeof (*st))) +return ; + asmvolatile ("1: xchgb %0, %2\n" "xor %1, %1\n" "2:\n"
@@ -3325,6 +3325,9 @@ static void record_steal_time(struct kvm_vcpu *vcpu)if (!user_access_begin (st,sizeof (*st))) goto dirty; }else { +if (!user_access_begin (st,sizeof (*st))) +return ; +unsafe_put_user (0 , &st->preempted, out); vcpu->arch.st.preempted =0 ; }
Signature · 1 line
2.27.0
Quoted 9 lines · Paolo Bonzini
When UBSAN is enabled, the code emitted for the call to
guest_pv_hasincludes a call to__ubsan_handle_load_invalid_value. objtool complains that this call happens with UACCESS enabled; to avoid the warning, pull the calls touser_access_begininto both arms of the "if" statement, after the check forguest_pv_has.Reported-by Stephen Rothwell <[email protected]>Cc David Woodhouse <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>
Thanks. I found a bunch of those objtool warnings during my original experimentation and testing, but clearly missed that one. I'll turn on CONFIG_UBSAN.