From: Oleksandr Tyshchenko Date: Fri, 29 Jan 2021 01:48:48 +0000 (+0200) Subject: xen/arm: io: Harden sign extension check X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~982 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ec1635ed877783911f0eda1b0ab10f00474b3db2;p=xen.git xen/arm: io: Harden sign extension check In the ideal world we would never get an undefined behavior when propagating the sign bit since that bit can only be set for access size smaller than the register size (i.e byte/half-word for aarch32, byte/half-word/word for aarch64). In the real world we need to care for *possible* hardware bug such as advertising a sign extension for either 64-bit (or 32-bit) on Arm64 (resp. Arm32). So harden a bit more the code to prevent undefined behavior when propagating the sign bit in case of buggy hardware. Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Stefano Stabellini Reviewed-by: Volodymyr Babchuk CC: Julien Grall --- diff --git a/xen/include/asm-arm/traps.h b/xen/include/asm-arm/traps.h index c6b3cc75ca..2ed2b85c6f 100644 --- a/xen/include/asm-arm/traps.h +++ b/xen/include/asm-arm/traps.h @@ -94,7 +94,8 @@ static inline register_t sign_extend(const struct hsr_dabt dabt, register_t r) * Note that we expect the read handler to have zeroed the bits * outside the requested access size. */ - if ( dabt.sign && (r & (1UL << (size - 1))) ) + if ( dabt.sign && (size < sizeof(register_t) * 8) && + (r & (1UL << (size - 1))) ) { /* * We are relying on register_t using the same as