From: Roland McGrath <roland@hack.frob.com>
Date: Fri, 27 Feb 2015 23:28:36 +0000 (-0800)
Subject: Actually read in the data when mmap fails.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c2754853e4e5400d505924a50461d011cbe4163;p=thirdparty%2Fglibc.git

Actually read in the data when mmap fails.
---

diff --git a/sysdeps/nacl/dl-map-segments.h b/sysdeps/nacl/dl-map-segments.h
index 5ad47de472c..d93badf1d38 100644
--- a/sysdeps/nacl/dl-map-segments.h
+++ b/sysdeps/nacl/dl-map-segments.h
@@ -149,6 +149,8 @@ _dl_map_segments (struct link_map *l, int fd,
                                      MAP_ANON|MAP_PRIVATE, -1, 0);
                 if (__glibc_unlikely (data == MAP_FAILED))
                   return DL_MAP_SEGMENTS_ERROR_MAP_ZERO_FILL;
+                if (read_in_data (fd, data, len, c->mapoff))
+                  return DL_MAP_SEGMENTS_ERROR_MAP_SEGMENT;
                 int error = __nacl_irt_dyncode.dyncode_create
                   ((void *) (l->l_addr + c->mapstart), data, len);
                 __munmap (data, len);