propagate from branch 'com.redhat.elfutils.roland.pending.libelf-threads' (head fc97c9c202b5d7d7699a3b1d5c53007a2ef37bb1)

            to branch 'com.redhat.elfutils' (head 67cccb9bfffc1a7fe3d8d355a2d9b6d0e489ff81)

1 files changed, 7 insertions, 1 deletions

diff --git a/libelf/elf_rawfile.c b/libelf/elf_rawfile.c
index a1c6a1d2..a62a3549 100644
--- a/libelf/elf_rawfile.c
+++ b/libelf/elf_rawfile.c
@@ -63,6 +63,8 @@ elf_rawfile (elf, ptr)
      Elf *elf;
      size_t *ptr;
 {
+  char *result;
+
   if (elf == NULL)
     {
       /* No valid descriptor.  */
@@ -77,8 +79,12 @@ elf_rawfile (elf, ptr)
   if (elf->map_address == NULL && __libelf_readall (elf) == NULL)
     goto error_out;
 
+  rwlock_rdlock (elf->lock);
   if (ptr != NULL)
     *ptr = elf->maximum_size;
 
-  return (char *) elf->map_address + elf->start_offset;
+  result = (char *) elf->map_address + elf->start_offset;
+  rwlock_unlock (elf->lock);
+
+  return result;
 }