From: Michal Orzel Date: Thu, 5 May 2022 11:59:06 +0000 (+0200) Subject: xen/arm: Avoid overflow using MIDR_IMPLEMENTOR_MASK X-Git-Tag: archive/raspbian/4.16.2-1+rpi1^2~34^2~15 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=048185188fbae9d0e7d25992d8318be2a4a5a2cc;p=xen.git xen/arm: Avoid overflow using MIDR_IMPLEMENTOR_MASK Value of macro MIDR_IMPLEMENTOR_MASK exceeds the range of integer and can lead to overflow. Currently there is no issue as it is used in an expression implicitly casted to u32 in MIDR_IS_CPU_MODEL_RANGE. To avoid possible problems, fix the macro. Signed-off-by: Michal Orzel Link: https://lore.kernel.org/r/20220426070603.56031-1-michal.orzel@arm.com Acked-by: Catalin Marinas Acked-by: Julien Grall (cherry picked from commit aa1cba100bff84b211f27639bd6efeaf7e701bcc) --- diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 852b5f3c24..7a1c4c4410 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -39,7 +39,7 @@ #define MIDR_VARIANT(midr) \ (((midr) & MIDR_VARIANT_MASK) >> MIDR_VARIANT_SHIFT) #define MIDR_IMPLEMENTOR_SHIFT 24 -#define MIDR_IMPLEMENTOR_MASK (0xff << MIDR_IMPLEMENTOR_SHIFT) +#define MIDR_IMPLEMENTOR_MASK (0xffU << MIDR_IMPLEMENTOR_SHIFT) #define MIDR_IMPLEMENTOR(midr) \ (((midr) & MIDR_IMPLEMENTOR_MASK) >> MIDR_IMPLEMENTOR_SHIFT)