From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/8] armv8: mmu: Fix "left shift in type int" undefined behavior
Date: Sun, 19 Aug 2018 21:51:42 -0400 [thread overview]
Message-ID: <20180820015142.GG11769@bill-the-cat> (raw)
In-Reply-To: <20180820000033.25519-4-erosca@de.adit-jv.com>
On Mon, Aug 20, 2018 at 02:00:27AM +0200, Eugeniu Rosca wrote:
> Fix the following UBSAN warnings:
>
> ------8<-----
> CPU: Renesas Electronics R8A7795 rev 2.0
> Model: Renesas Salvator-X board based on r8a7795 ES2.0+
> ====================================================================
> UBSAN: Undefined behaviour in arch/arm/cpu/armv8/cache_v8.c:72:9
> left shift of 1 by 31 places cannot be represented in type 'int'
> ====================================================================
> ====================================================================
> UBSAN: Undefined behaviour in arch/arm/cpu/armv8/cache_v8.c:74:9
> left shift of 1 by 31 places cannot be represented in type 'int'
> ====================================================================
> ------8<-----
>
> While at it, convert to BIT() macro all current "1 << X" shift
> constructs with X >= 15, which may lead to the same UB, if untreated.
>
> Fixes: ad3d6e88a1a4 ("armv8/mmu: Set bits marked RES1 in TCR")
> Fixes: 9bb367a590fe ("arm64: Disable TTBR1 maps in EL1")
> Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
> ---
> arch/arm/include/asm/armv8/mmu.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/include/asm/armv8/mmu.h b/arch/arm/include/asm/armv8/mmu.h
> index 62d00d15c26d..b2ce13db0d2b 100644
> --- a/arch/arm/include/asm/armv8/mmu.h
> +++ b/arch/arm/include/asm/armv8/mmu.h
> @@ -94,11 +94,11 @@
> #define TCR_TG0_4K (0 << 14)
> #define TCR_TG0_64K (1 << 14)
> #define TCR_TG0_16K (2 << 14)
> -#define TCR_EPD1_DISABLE (1 << 23)
> +#define TCR_EPD1_DISABLE BIT(23)
>
> -#define TCR_EL1_RSVD (1 << 31)
> -#define TCR_EL2_RSVD (1 << 31 | 1 << 23)
> -#define TCR_EL3_RSVD (1 << 31 | 1 << 23)
> +#define TCR_EL1_RSVD BIT(31)
> +#define TCR_EL2_RSVD (BIT(31) | BIT(23))
> +#define TCR_EL3_RSVD (BIT(31) | BIT(23))
>
> #ifndef __ASSEMBLY__
> static inline void set_ttbr_tcr_mair(int el, u64 table, u64 tcr, u64 attr)
For consistency within the file, spell it out as 1UL ? I don't like
mixing shifts and BITS in a file, and I really don't like being
inconsistent, so I'd also be OK with BIT() in all of the bits.
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180819/269ecc04/attachment.sig>
next prev parent reply other threads:[~2018-08-20 1:51 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-20 0:00 [U-Boot] [PATCH 0/8] Import Undefined Behavior Sanitizer Eugeniu Rosca
2018-08-20 0:00 ` [U-Boot] [PATCH 1/8] UBSAN: run-time undefined behavior sanity checker Eugeniu Rosca
2018-08-20 1:51 ` Tom Rini
2018-08-20 12:54 ` Eugeniu Rosca
2018-08-20 17:50 ` Tom Rini
2018-08-20 15:00 ` York Sun
2018-08-20 21:00 ` Eugeniu Rosca
2018-08-20 0:00 ` [U-Boot] [PATCH 2/8] mmc: Fix "left shift in type int" undefined behavior Eugeniu Rosca
2018-08-20 0:00 ` [U-Boot] [PATCH 3/8] armv8: mmu: " Eugeniu Rosca
2018-08-20 1:51 ` Tom Rini [this message]
2018-08-20 13:24 ` Eugeniu Rosca
2018-08-20 0:00 ` [U-Boot] [PATCH 4/8] pinctrl: renesas: " Eugeniu Rosca
2018-08-20 8:07 ` Marek Vasut
2018-08-20 13:42 ` Eugeniu Rosca
2018-08-20 0:00 ` [U-Boot] [PATCH 5/8] net: phy: " Eugeniu Rosca
2018-08-20 0:00 ` [U-Boot] [PATCH 6/8] net: ravb: " Eugeniu Rosca
2018-08-20 8:05 ` Marek Vasut
2018-08-20 0:00 ` [U-Boot] [PATCH 7/8] mmc: Fix read-past-end-of-array " Eugeniu Rosca
2018-08-20 0:00 ` [U-Boot] [PATCH 8/8] hashtable: Fix zero-sized array " Eugeniu Rosca
2018-08-20 1:51 ` Tom Rini
2018-08-20 1:51 ` [U-Boot] [PATCH 0/8] Import Undefined Behavior Sanitizer Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180820015142.GG11769@bill-the-cat \
--to=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox