lkml.org 
[lkml]   [2015]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] xen: use correct type for HYPERVISOR_memory_op()
From
Date
Ping?

On 09/04/2015 02:50 PM, Juergen Gross wrote:
> HYPERVISOR_memory_op() is defined to return an "int" value. This is
> wrong, as the Xen hypervisor will return "long".
>
> The sub-function XENMEM_maximum_reservation returns the maximum
> number of pages for the current domain. An int will overflow for a
> domain configured with 8TB of memory or more.
>
> Correct this by using the correct type.
>
> Signed-off-by: Juergen Gross <jgross@suse.com>
> ---
> arch/x86/include/asm/xen/hypercall.h | 4 ++--
> arch/x86/xen/setup.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
> index ca08a27..b7a735f 100644
> --- a/arch/x86/include/asm/xen/hypercall.h
> +++ b/arch/x86/include/asm/xen/hypercall.h
> @@ -336,10 +336,10 @@ HYPERVISOR_update_descriptor(u64 ma, u64 desc)
> return _hypercall4(int, update_descriptor, ma, ma>>32, desc, desc>>32);
> }
>
> -static inline int
> +static inline long
> HYPERVISOR_memory_op(unsigned int cmd, void *arg)
> {
> - return _hypercall2(int, memory_op, cmd, arg);
> + return _hypercall2(long, memory_op, cmd, arg);
> }
>
> static inline int
> diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
> index f5ef674..4ebfcec 100644
> --- a/arch/x86/xen/setup.c
> +++ b/arch/x86/xen/setup.c
> @@ -548,7 +548,7 @@ static unsigned long __init xen_get_max_pages(void)
> {
> unsigned long max_pages, limit;
> domid_t domid = DOMID_SELF;
> - int ret;
> + long ret;
>
> limit = xen_get_pages_limit();
> max_pages = limit;
>



\
 
 \ /
  Last update: 2015-09-14 15:01    [W:0.067 / U:2.444 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site