re PR libbacktrace/88890 (libbacktrace on 32-bit system with _FILE_OFFSET_BITS =...

	PR libbacktrace/88890
	* mmapio.c (backtrace_get_view): Change size parameter to
	uint64_t.  Check that value fits in size_t.
	* read.c (backtrace_get_view): Likewise.
	* internal.h (backtrace_get_view): Update declaration.
	* elf.c (elf_add): Pass shstrhdr->sh_size to backtrace_get_view.

From-SVN: r268082

diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 54c4b79d62332691675b6cffc88f9234b32be4cf..cf44db69e2d95f13e881051b64b8e99598d853a3 100644 (file)
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,12 @@
+2019-01-18  Ian Lance Taylor  <iant@golang.org>
+
+       PR libbacktrace/88890
+       * mmapio.c (backtrace_get_view): Change size parameter to
+       uint64_t.  Check that value fits in size_t.
+       * read.c (backtrace_get_view): Likewise.
+       * internal.h (backtrace_get_view): Update declaration.
+       * elf.c (elf_add): Pass shstrhdr->sh_size to backtrace_get_view.
+
 2019-01-17  Tom de Vries  <tdevries@suse.de>
 
        PR libbacktrace/82857

diff --git a/libbacktrace/elf.c b/libbacktrace/elf.c
index 87e7b0d361d5414bfa68c1608178ee22cf5ed756..01cf6f9cff7ad46dfbf7096d4384d59dd6cbb698 100644 (file)
--- a/libbacktrace/elf.c
+++ b/libbacktrace/elf.c
@@ -2813,7 +2813,7 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor,
   shstr_size = shstrhdr->sh_size;
   shstr_off = shstrhdr->sh_offset;
 
-  if (!backtrace_get_view (state, descriptor, shstr_off, shstr_size,
+  if (!backtrace_get_view (state, descriptor, shstr_off, shstrhdr->sh_size,
                           error_callback, data, &names_view))
     goto fail;
   names_view_valid = 1;

diff --git a/libbacktrace/internal.h b/libbacktrace/internal.h
index e8389779322bfcf0eb96dfcdd91762233def7df2..065b9535e8b0f24bfc584fbb21835fad132e85ba 100644 (file)
--- a/libbacktrace/internal.h
+++ b/libbacktrace/internal.h
@@ -179,7 +179,7 @@ struct backtrace_view
 /* Create a view of SIZE bytes from DESCRIPTOR at OFFSET.  Store the
    result in *VIEW.  Returns 1 on success, 0 on error.  */
 extern int backtrace_get_view (struct backtrace_state *state, int descriptor,
-                              off_t offset, size_t size,
+                              off_t offset, uint64_t size,
                               backtrace_error_callback error_callback,
                               void *data, struct backtrace_view *view);
 

diff --git a/libbacktrace/mmapio.c b/libbacktrace/mmapio.c
index a87eb8f2c3674fd9f9e2fe7523a6f1787525eef6..b188a43a4f224f8afd916c9eaa295e40b9d631fa 100644 (file)
--- a/libbacktrace/mmapio.c
+++ b/libbacktrace/mmapio.c
@@ -51,7 +51,7 @@ POSSIBILITY OF SUCH DAMAGE.  */
 
 int
 backtrace_get_view (struct backtrace_state *state ATTRIBUTE_UNUSED,
-                   int descriptor, off_t offset, size_t size,
+                   int descriptor, off_t offset, uint64_t size,
                    backtrace_error_callback error_callback,
                    void *data, struct backtrace_view *view)
 {
@@ -60,6 +60,12 @@ backtrace_get_view (struct backtrace_state *state ATTRIBUTE_UNUSED,
   off_t pageoff;
   void *map;
 
+  if ((uint64_t) (size_t) size != size)
+    {
+      error_callback (data, "file size too large", 0);
+      return 0;
+    }
+
   pagesize = getpagesize ();
   inpage = offset % pagesize;
   pageoff = offset - inpage;

diff --git a/libbacktrace/read.c b/libbacktrace/read.c
index 010f8f26148e1ca7d364bf641954b58a22964e28..eb4852610223bb7d1fae40f4c4d96474af89a3d3 100644 (file)
--- a/libbacktrace/read.c
+++ b/libbacktrace/read.c
@@ -46,12 +46,18 @@ POSSIBILITY OF SUCH DAMAGE.  */
 
 int
 backtrace_get_view (struct backtrace_state *state, int descriptor,
-                   off_t offset, size_t size,
+                   off_t offset, uint64_t size,
                    backtrace_error_callback error_callback,
                    void *data, struct backtrace_view *view)
 {
   ssize_t got;
 
+  if ((uint64_t) (size_t) size != size)
+    {
+      error_callback (data, "file size too large", 0);
+      return 0;
+    }
+
   if (lseek (descriptor, offset, SEEK_SET) < 0)
     {
       error_callback (data, "lseek", errno);