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>
Wed, 17 Nov 2021 10:04:45 +0000 (11:04 +0100)
commitf7ece74d0ab21a2c336abaf2dc4039d633ab17d5
treefc595936073930f61febd28b4df2cd641e8c9e3a
parent4c09233d17ceaf6ecb2d6e20aafc6401ce0efcce
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