[PATCH 2/2] Don't overflow in __libdw_in_section

[PATCH 2/2] Don't overflow in __libdw_in_section

[Ulf Hermann]

This exposes a bug in dwarf_formstring as detected by the dwarf-getmacros
test. We cannot unconditionally assume that a string is in either the
IDX_debug_info or the IDX_debug_types section as determined by
cu_sec_idx.

Signed-off-by: Ulf Hermann <ulf.hermann@qt.io>
---
 libdw/ChangeLog | 4 ++++
 libdw/libdwP.h  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 665c232..a5c1ff0 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,5 +1,9 @@
 2017-05-09  Ulf Hermann  <ulf.hermann@qt.io>
 
+	* libdwP.h: Fix check for the upper border of the range in __libdw_in_section.
+
+2017-05-09  Ulf Hermann  <ulf.hermann@qt.io>
+
 	* dwarf_getmacros.c: Initialize type_offset of the fake CU.
 
 2017-02-28  Ulf Hermann  <ulf.hermann@qt.io>
diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index cefcafd..b87a94b 100644
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -642,7 +642,8 @@ __libdw_in_section (Dwarf *dbg, int sec_index,
   if (data == NULL)
     return false;
   if (unlikely (addr < data->d_buf)
-      || unlikely (data->d_size - (addr - data->d_buf) < size))
+      || unlikely (data->d_size < size)
+      || unlikely ((size_t)(addr - data->d_buf) > data->d_size - size))
     {
       __libdw_seterrno (DWARF_E_INVALID_OFFSET);
       return false;
-- 
2.1.4