KVM: x86: move guest_pv_has out of user_access section
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 12 Nov 2021 07:53:41 +0000 (02:53 -0500)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 12 Nov 2021 07:53:52 +0000 (02:53 -0500)
commit3e067fd8503d6205aa0c1c8f48f6b209c592d19c
treee2823b5d7c2e3d740f9ecb810ddfff9ad6d7896a
parentf5396f2d826823b16de5d2cef6f46ffc66712482
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.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/x86.c