[llvm-branch-commits] [libunwind] r353287 - Merging r352016:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Feb  6 02:22:11 2019
New Revision: 353287

URL: http://llvm.org/viewvc/llvm-project?rev=353287&view=rev
Log:
Merging r352016:
------------------------------------------------------------------------
r352016 | phosek | 2019-01-24 04:04:42 +0100 (Thu, 24 Jan 2019) | 12 lines

[libunwind] Don't abort if encoutering invalid .eh_frame_hdr

Recent Linux kernel release has introduced a bug as part of the ORC
rollout where the vDSO has a valid .eh_frame section, but it's missing
the .eh_frame_hdr section and GNU_EH_FRAME segment has zero size. This
causes libunwind to abort which breaks programs that use libunwind.

The other unwinder implementation (libgcc, non-gnu) instead silently
bail out unless being compiled as debug. This change modifies libunwind
to use the same strategy.

Differential Revision: https://reviews.llvm.org/D57081
------------------------------------------------------------------------

Modified:
    libunwind/branches/release_80/   (props changed)
    libunwind/branches/release_80/src/AddressSpace.hpp
    libunwind/branches/release_80/src/EHHeaderParser.hpp

Propchange: libunwind/branches/release_80/
------------------------------------------------------------------------------
    svn:mergeinfo = /libunwind/trunk:352016

Modified: libunwind/branches/release_80/src/AddressSpace.hpp
URL: http://llvm.org/viewvc/llvm-project/libunwind/branches/release_80/src/AddressSpace.hpp?rev=353287&r1=353286&r2=353287&view=diff
==============================================================================
--- libunwind/branches/release_80/src/AddressSpace.hpp (original)
+++ libunwind/branches/release_80/src/AddressSpace.hpp Wed Feb  6 02:22:11 2019
@@ -534,11 +534,11 @@ inline bool LocalAddressSpace::findUnwin
 #endif
             cbdata->sects->dwarf_index_section = eh_frame_hdr_start;
             cbdata->sects->dwarf_index_section_length = phdr->p_memsz;
-            EHHeaderParser<LocalAddressSpace>::decodeEHHdr(
+            found_hdr = EHHeaderParser<LocalAddressSpace>::decodeEHHdr(
                 *cbdata->addressSpace, eh_frame_hdr_start, phdr->p_memsz,
                 hdrInfo);
-            cbdata->sects->dwarf_section = hdrInfo.eh_frame_ptr;
-            found_hdr = true;
+            if (found_hdr)
+              cbdata->sects->dwarf_section = hdrInfo.eh_frame_ptr;
           }
         }
 

Modified: libunwind/branches/release_80/src/EHHeaderParser.hpp
URL: http://llvm.org/viewvc/llvm-project/libunwind/branches/release_80/src/EHHeaderParser.hpp?rev=353287&r1=353286&r2=353287&view=diff
==============================================================================
--- libunwind/branches/release_80/src/EHHeaderParser.hpp (original)
+++ libunwind/branches/release_80/src/EHHeaderParser.hpp Wed Feb  6 02:22:11 2019
@@ -36,7 +36,7 @@ public:
     uint8_t table_enc;
   };
 
-  static void decodeEHHdr(A &addressSpace, pint_t ehHdrStart, pint_t ehHdrEnd,
+  static bool decodeEHHdr(A &addressSpace, pint_t ehHdrStart, pint_t ehHdrEnd,
                           EHHeaderInfo &ehHdrInfo);
   static bool findFDE(A &addressSpace, pint_t pc, pint_t ehHdrStart,
                       uint32_t sectionLength,
@@ -53,12 +53,14 @@ private:
 };
 
 template <typename A>
-void EHHeaderParser<A>::decodeEHHdr(A &addressSpace, pint_t ehHdrStart,
+bool EHHeaderParser<A>::decodeEHHdr(A &addressSpace, pint_t ehHdrStart,
                                     pint_t ehHdrEnd, EHHeaderInfo &ehHdrInfo) {
   pint_t p = ehHdrStart;
   uint8_t version = addressSpace.get8(p++);
-  if (version != 1)
-    _LIBUNWIND_ABORT("Unsupported .eh_frame_hdr version");
+  if (version != 1) {
+    _LIBUNWIND_LOG0("Unsupported .eh_frame_hdr version");
+    return false;
+  }
 
   uint8_t eh_frame_ptr_enc = addressSpace.get8(p++);
   uint8_t fde_count_enc = addressSpace.get8(p++);
@@ -71,6 +73,8 @@ void EHHeaderParser<A>::decodeEHHdr(A &a
           ? 0
           : addressSpace.getEncodedP(p, ehHdrEnd, fde_count_enc, ehHdrStart);
   ehHdrInfo.table = p;
+
+  return true;
 }
 
 template <typename A>
@@ -102,7 +106,9 @@ bool EHHeaderParser<A>::findFDE(A &addre
   pint_t ehHdrEnd = ehHdrStart + sectionLength;
 
   EHHeaderParser<A>::EHHeaderInfo hdrInfo;
-  EHHeaderParser<A>::decodeEHHdr(addressSpace, ehHdrStart, ehHdrEnd, hdrInfo);
+  if (!EHHeaderParser<A>::decodeEHHdr(addressSpace, ehHdrStart, ehHdrEnd,
+                                      hdrInfo))
+    return false;
 
   size_t tableEntrySize = getTableEntrySize(hdrInfo.table_enc);
   pint_t tableEntry;