From: Ian Campbell Date: Thu, 10 Oct 2013 14:43:43 +0000 (+0100) Subject: xen: arm: make sure pagetable mask macros have appropriate size X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6130 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8e782d0191d260c1a143f081fa0a30c2a4182aee;p=xen.git xen: arm: make sure pagetable mask macros have appropriate size {ZEROETH,FIRST,SECOND,THIRD}_MASK are used with physical addresses which may be larger than 32 bits. Therefore ensure that they are wide enough by casting to paddr_t otherwise we may truncate addresses on 32-bit. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 3d0f8a97f0..d468418330 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -323,17 +323,17 @@ static inline int gva_to_ipa(vaddr_t va, paddr_t *paddr) #define LPAE_ENTRIES (1u << LPAE_SHIFT) #define LPAE_ENTRY_MASK (LPAE_ENTRIES - 1) -#define THIRD_SHIFT PAGE_SHIFT -#define THIRD_SIZE (1u << THIRD_SHIFT) -#define THIRD_MASK (~(THIRD_SIZE - 1)) -#define SECOND_SHIFT (THIRD_SHIFT + LPAE_SHIFT) -#define SECOND_SIZE (1u << SECOND_SHIFT) -#define SECOND_MASK (~(SECOND_SIZE - 1)) -#define FIRST_SHIFT (SECOND_SHIFT + LPAE_SHIFT) -#define FIRST_SIZE (1u << FIRST_SHIFT) -#define FIRST_MASK (~(FIRST_SIZE - 1)) +#define THIRD_SHIFT (PAGE_SHIFT) +#define THIRD_SIZE ((paddr_t)1 << THIRD_SHIFT) +#define THIRD_MASK (~(THIRD_SIZE - 1)) +#define SECOND_SHIFT (THIRD_SHIFT + LPAE_SHIFT) +#define SECOND_SIZE ((paddr_t)1 << SECOND_SHIFT) +#define SECOND_MASK (~(SECOND_SIZE - 1)) +#define FIRST_SHIFT (SECOND_SHIFT + LPAE_SHIFT) +#define FIRST_SIZE ((paddr_t)1 << FIRST_SHIFT) +#define FIRST_MASK (~(FIRST_SIZE - 1)) #define ZEROETH_SHIFT (FIRST_SHIFT + LPAE_SHIFT) -#define ZEROETH_SIZE (1u << ZEROETH_SHIFT) +#define ZEROETH_SIZE ((paddr_t)1 << ZEROETH_SHIFT) #define ZEROETH_MASK (~(ZEROETH_SIZE - 1)) /* Calculate the offsets into the pagetables for a given VA */