maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[elf2] Add error checking for the R_X86_64_32 relocation. 

llvm-svn: 247745
This commit is contained in:
Michael J. Spencer 2015-09-15 23:36:30 +00:00
parent 386e2ab158
commit dff84070da
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lld/ELF/Writer.cpp
View File

@ -14,6 +14,7 @@
#include "Symbols.h"
#include "SymbolTable.h"
#include "llvm/ADT/APInt.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/MC/StringTableBuilder.h"
@ -499,9 +500,16 @@ template <class ELFT> void OutputSection<ELFT>::writeTo(uint8_t *Buf) {
case llvm::ELF::R_X86_64_64:
support::endian::write64le(Location, SymVA + RI.r_addend);
break;
case llvm::ELF::R_X86_64_32:
support::endian::write32le(Location, SymVA + RI.r_addend);
case llvm::ELF::R_X86_64_32: {
APInt VA(64, SymVA);
APInt Addend(64, RI.r_addend, true);
APInt Result64 = VA + Addend;
APInt Result = Result64.trunc(32);
if (Result.zext(64) != Result64)
error("Relocation out of range");
support::endian::write32le(Location, Result.getZExtValue());
break;
}
default:
llvm::errs() << Twine("unrecognized reloc ") + Twine(Type) << '\n';
break;

2
lld/test/elf2/Inputs/abs.s
View File

@ -1,2 +1,4 @@
.global abs
abs = 0x42
.global big
big = 0x1000000000

10
lld/test/elf2/relocation-errors.s Normal file
View File

@ -0,0 +1,10 @@
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/abs.s -o %tabs
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
// RUN: not lld -flavor gnu2 %tabs %t -o %t2 2>&1 | FileCheck %s
// REQUIRES: x86
.global _start
_start:
movl $big, %edx
#CHECK: Relocation out of range