From 1d61f7949f77796ee407466f3ca7f42dcde9251b Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Sun, 18 Dec 2016 22:53:49 -0800 Subject: [PATCH] Fix an integer overflow in RISC-V relocation handling * elfnn-riscv.c (bfd_riscv_get_max_alignment): Return bfd_vma instead of unsigned int. --- bfd/ChangeLog | 5 +++++ bfd/elfnn-riscv.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b6bba2ac3e..f2b1707e5a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2016-12-20 Andrew Waterman + + * elfnn-riscv.c (bfd_riscv_get_max_alignment): Return bfd_vma + instead of unsigned int. + 2016-12-20 Andrew Waterman Kuan-Lin Chen diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index 51a2a10e03..a9b0ac6be0 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -2759,7 +2759,7 @@ _bfd_riscv_relax_call (bfd *abfd, asection *sec, asection *sym_sec, /* Traverse all output sections and return the max alignment. */ -static unsigned int +static bfd_vma _bfd_riscv_get_max_alignment (asection *sec) { unsigned int max_alignment_power = 0; @@ -2771,7 +2771,7 @@ _bfd_riscv_get_max_alignment (asection *sec) max_alignment_power = o->alignment_power; } - return 1 << max_alignment_power; + return (bfd_vma) 1 << max_alignment_power; } /* Relax non-PIC global variable references. */