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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Nov 2021 18:17:14 +0000 (19:17 +0100)
commitfb58e9a26c3ce0278d8118fc2a70e6d528967f42
treec4160f21c55e1c673610ff746e8cfd84cb6b2c5e
parentd5e79d872babb12a1376bc07b4abae68d752f66d
KVM: x86: move guest_pv_has out of user_access section

commit 3e067fd8503d6205aa0c1c8f48f6b209c592d19c upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kvm/x86.c