[PATCH] [08/10] ELF/Aarch64: Add R_AARCH64_ADR_GOT_PAGE and R_AARCH64_LD64_GOT_LO12_NC checks

[Rui Ueyama]

LGTM

On Tue, Apr 7, 2015 at 7:40 AM, Adhemerval Zanella <
adhemerval.zanella at linaro.org> wrote:

> Hi ruiu, shankar.easwaran,
>
> Hi ruiu, shankarke,
>
> This is re-post of a previous attempt.  This patch adds
> R_AARCH64_ADR_GOT_PAGE overflow and R_AARCH64_LD64_GOT_LO12_NC unaligned
> value checks.
>
> http://reviews.llvm.org/D8867
>
> Files:
>   lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp
>   lib/ReaderWriter/ELF/TargetHandler.h
>
> Index: lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp
> ===================================================================
> --- lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp
> +++ lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp
> @@ -247,10 +247,12 @@
>    write32le(location, result | read32le(location));
>  }
>
> -static void relocR_AARCH64_ADR_GOT_PAGE(uint8_t *location, uint64_t P,
> +static std::error_code relocR_AARCH64_ADR_GOT_PAGE(uint8_t *location,
> uint64_t P,
>                                          uint64_t S, int64_t A) {
>    uint64_t result = PAGE(S + A) - PAGE(P);
> -  result >>= 12;
> +  if (!isInt<32>(result))
> +    return make_out_of_range_reloc_error();
> +  result = (result >> 12) & 0x3FFFF;
>    uint32_t immlo = result & 0x3;
>    uint32_t immhi = result & 0x1FFFFC;
>    immlo = immlo << 29;
> @@ -263,20 +265,23 @@
>          llvm::dbgs() << " immlo: " << Twine::utohexstr(immlo);
>          llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
>    write32le(location, immlo | immhi | read32le(location));
> +  return std::error_code();
>  }
>
>  // R_AARCH64_LD64_GOT_LO12_NC
> -static void relocR_AARCH64_LD64_GOT_LO12_NC(uint8_t *location, uint64_t P,
> +static std::error_code relocR_AARCH64_LD64_GOT_LO12_NC(uint8_t *location,
> uint64_t P,
>                                              uint64_t S, int64_t A) {
>    int32_t result = S + A;
> -  DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
> -        llvm::dbgs() << " S: " << Twine::utohexstr(S);
> +  DEBUG(llvm::dbgs() << " S: " << Twine::utohexstr(S);
>          llvm::dbgs() << " A: " << Twine::utohexstr(A);
>          llvm::dbgs() << " P: " << Twine::utohexstr(P);
>          llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
> +  if ((result & 0x7) != 0)
> +    return make_unaligned_range_reloc_error();
>    result &= 0xFF8;
>    result <<= 7;
>    write32le(location, result | read32le(location));
> +  return std::error_code();
>  }
>
>  // ADD_AARCH64_GOTRELINDEX
> @@ -408,11 +413,9 @@
>      relocR_AARCH64_CONDBR19(loc, reloc, target, addend);
>      break;
>    case R_AARCH64_ADR_GOT_PAGE:
> -    relocR_AARCH64_ADR_GOT_PAGE(loc, reloc, target, addend);
> -    break;
> +    return relocR_AARCH64_ADR_GOT_PAGE(loc, reloc, target, addend);
>    case R_AARCH64_LD64_GOT_LO12_NC:
> -    relocR_AARCH64_LD64_GOT_LO12_NC(loc, reloc, target, addend);
> -    break;
> +    return relocR_AARCH64_LD64_GOT_LO12_NC(loc, reloc, target, addend);
>    case R_AARCH64_LDST8_ABS_LO12_NC:
>      relocR_AARCH64_LDST8_ABS_LO12_NC(loc, reloc, target, addend);
>      break;
> Index: lib/ReaderWriter/ELF/TargetHandler.h
> ===================================================================
> --- lib/ReaderWriter/ELF/TargetHandler.h
> +++ lib/ReaderWriter/ELF/TargetHandler.h
> @@ -25,6 +25,10 @@
>    return make_dynamic_error_code(Twine("Relocation out of range"));
>  }
>
> +inline std::error_code make_unaligned_range_reloc_error() {
> +  return make_dynamic_error_code(Twine("Relocation not aligned"));
> +}
> +
>  } // end namespace elf
>  } // end namespace lld
>
> EMAIL PREFERENCES
>   http://reviews.llvm.org/settings/panel/emailpreferences/
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150407/da67699e/attachment.html>