[lld] 1837333 - [ELF] --check-sections: allow address 0xffffffff for ELFCLASS32

Fangrui Song via llvm-commits llvm-commits at lists.llvm.org
Sat Oct 1 15:37:14 PDT 2022


Author: Fangrui Song
Date: 2022-10-01T15:37:07-07:00
New Revision: 1837333dac94ed78ffe093faa565ec6221f98c46

URL: https://github.com/llvm/llvm-project/commit/1837333dac94ed78ffe093faa565ec6221f98c46
DIFF: https://github.com/llvm/llvm-project/commit/1837333dac94ed78ffe093faa565ec6221f98c46.diff

LOG: [ELF] --check-sections: allow address 0xffffffff for ELFCLASS32

Fix https://github.com/llvm/llvm-project/issues/58101

Added: 
    

Modified: 
    lld/ELF/Writer.cpp
    lld/test/ELF/linkerscript/i386-sections-max-va-overflow.s

Removed: 
    


################################################################################
diff  --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 26c6239563dc3..ef80082f40480 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -2686,7 +2686,7 @@ template <class ELFT> void Writer<ELFT>::checkSections() {
   // First, check that section's VAs fit in available address space for target.
   for (OutputSection *os : outputSections)
     if ((os->addr + os->size < os->addr) ||
-        (!ELFT::Is64Bits && os->addr + os->size > UINT32_MAX))
+        (!ELFT::Is64Bits && os->addr + os->size > uint64_t(UINT32_MAX) + 1))
       errorOrWarn("section " + os->name + " at 0x" + utohexstr(os->addr) +
                   " of size 0x" + utohexstr(os->size) +
                   " exceeds available address space");

diff  --git a/lld/test/ELF/linkerscript/i386-sections-max-va-overflow.s b/lld/test/ELF/linkerscript/i386-sections-max-va-overflow.s
index d424112a1ce4a..25bef1575cce6 100644
--- a/lld/test/ELF/linkerscript/i386-sections-max-va-overflow.s
+++ b/lld/test/ELF/linkerscript/i386-sections-max-va-overflow.s
@@ -5,9 +5,14 @@
 # RUN: echo "           .bar : { *(.bar*) } }" >> %t.script
 # RUN: not ld.lld -o /dev/null --script %t.script %t.o 2>&1 | FileCheck %s -check-prefix=ERR
 
-## .bar section has data in [0xfffffff1, 0xfffffff1 + 0x10] == [0xffffff1, 0x1]. 
+## .bar section has data in [0xfffffff1, 0xfffffff1 + 0x10] == [0xfffffff1, 0x1].
 ## Check we can catch this overflow.
 # ERR: error: section .bar at 0xFFFFFFF1 of size 0x10 exceeds available address space
 
+## [0xfffffff1, 0x100000000) is allowed.
+# RUN: echo "SECTIONS { . = 0xfffffff0;" > %t.script
+# RUN: echo "           .bar : { *(.bar*) } }" >> %t.script
+# RUN: ld.lld -o /dev/null -T %t.script %t.o
+
 .section .bar,"ax", at progbits
 .zero 0x10


        


More information about the llvm-commits mailing list