[PATCH] D81469: [DebugInfo/DWARF] - Report .eh_frame sections of version != 1.

[George Rimar via Phabricator via llvm-commits]

grimar created this revision.
grimar added reviewers: jhenderson, MaskRay, aprantl, ikudrin.
Herald added a subscriber: hiraditya.
Herald added a project: LLVM.

Specification (https://refspecs.linuxbase.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/ehframechpt.html#AEN1349)
says that the value of Version field for .eh_frame should be 1.

Though we accept other values and might perform an attempt to read
it as a .debug_frame because of that, what is wrong.

This patch adds a version check.


https://reviews.llvm.org/D81469

Files:
  llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
  llvm/test/DebugInfo/X86/eh-frame-invalid-version-zero.s
  llvm/test/DebugInfo/X86/eh-frame-invalid-version.s


Index: llvm/test/DebugInfo/X86/eh-frame-invalid-version.s
===================================================================
--- /dev/null
+++ llvm/test/DebugInfo/X86/eh-frame-invalid-version.s
@@ -0,0 +1,13 @@
+## Check we do not support .eh_frame sections of versions greater than 1.
+
+# RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t
+# RUN: not llvm-dwarfdump -debug-frame %t 2>&1 | FileCheck %s
+
+# CHECK: unsupported CIE version: 2
+
+.section .eh_frame,"a", at unwind
+ .long .Lend - .LCIEptr ## Length
+.LCIEptr:
+ .long 0x00000000       ## CIE ID
+ .byte 2                ## Version
+.Lend:
Index: llvm/test/DebugInfo/X86/eh-frame-invalid-version-zero.s
===================================================================
--- /dev/null
+++ llvm/test/DebugInfo/X86/eh-frame-invalid-version-zero.s
@@ -0,0 +1,13 @@
+## Check we do not support .eh_frame sections of version 0.
+
+# RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t
+# RUN: not llvm-dwarfdump -debug-frame %t 2>&1 | FileCheck %s
+
+# CHECK: unsupported CIE version: 0
+
+.section .eh_frame,"a", at unwind
+ .long .Lend - .LCIEptr ## Length
+.LCIEptr:
+ .long 0x00000000       ## CIE ID
+ .byte 0                ## Version
+.Lend:
Index: llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
===================================================================
--- llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
+++ llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
@@ -415,6 +415,10 @@
       uint8_t Version = Data.getU8(&Offset);
       const char *Augmentation = Data.getCStr(&Offset);
       StringRef AugmentationString(Augmentation ? Augmentation : "");
+      if (IsEH && Version != 1)
+        return createStringError(errc::not_supported,
+                                 "unsupported CIE version: %" PRIu8, Version);
+
       uint8_t AddressSize = Version < 4 ? Data.getAddressSize() :
                                           Data.getU8(&Offset);
       Data.setAddressSize(AddressSize);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D81469.269535.patch
Type: text/x-patch
Size: 1987 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200609/4d30175b/attachment.bin>