Received-SPF: pass (google.com: domain of linux-kernel+bounces-76305-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Paul Durrant <xadimgnik@gmail.com>
Message-ID: <c8c37018-8681-458f-96b7-82bae88ebcd3@xen.org>
Date: Thu, 22 Feb 2024 10:14:38 +0000
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Reply-To: paul@xen.org
Subject: Re: [PATCH] KVM: x86/xen: fix 32-bit pointer cast
Content-Language: en-US
To: Arnd Bergmann <arnd@kernel.org>, David Woodhouse <dwmw2@infradead.org>,
 Sean Christopherson <seanjc@google.com>, Paolo Bonzini <pbonzini@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>, Thomas Gleixner <tglx@linutronix.de>,
 Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
 Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org,
 "H. Peter Anvin" <hpa@zytor.com>, Jens Axboe <axboe@kernel.dk>,
 Jan Kara <jack@suse.cz>, Christian Brauner <brauner@kernel.org>,
 kvm@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20240222100412.560961-1-arnd@kernel.org>
Organization: Xen Project
In-Reply-To: <20240222100412.560961-1-arnd@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

On 22/02/2024 10:03, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> shared_info.hva is a 64-bit variable, so casting to a pointer causes
> a warning in 32-bit builds:
> 
> arch/x86/kvm/xen.c: In function 'kvm_xen_hvm_set_attr':
> arch/x86/kvm/xen.c:660:45: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
>    660 |                         void __user * hva = (void *)data->u.shared_info.hva;
> 
> Replace the cast with a u64_to_user_ptr() call that does the right thing.

Thanks Arnd. I'd just got a ping from kernel test robot for lack of 
__user qualifier in the cast 
(https://lore.kernel.org/oe-kbuild-all/202402221721.mhF8MNVh-lkp@intel.com/), 
which this should also fix.

> 
> Fixes: 01a871852b11 ("KVM: x86/xen: allow shared_info to be mapped by fixed HVA")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>   arch/x86/kvm/xen.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Paul Durrant <paul@xen.org>

> diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
> index 01c0fd138d2f..8a04e0ae9245 100644
> --- a/arch/x86/kvm/xen.c
> +++ b/arch/x86/kvm/xen.c
> @@ -657,7 +657,7 @@ int kvm_xen_hvm_set_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data)
>   						     gfn_to_gpa(gfn), PAGE_SIZE);
>   			}
>   		} else {
> -			void __user * hva = (void *)data->u.shared_info.hva;
> +			void __user * hva = u64_to_user_ptr(data->u.shared_info.hva);
>   
>   			if (!PAGE_ALIGNED(hva) || !access_ok(hva, PAGE_SIZE)) {
>   				r = -EINVAL;