Release 2.33.1

[external/binutils.git] / libctf / ctf-open-bfd.c

diff --git a/libctf/ctf-open-bfd.c b/libctf/ctf-open-bfd.c
index 5e34d12..bb2d7e6 100644 (file)
--- a/libctf/ctf-open-bfd.c
+++ b/libctf/ctf-open-bfd.c
@@ -26,6 +26,8 @@
 #include <fcntl.h>
 #include <elf.h>
 #include <bfd.h>
+#include "swap.h"
+#include "ctf-endian.h"
 
 #include "elf-bfd.h"
 
@@ -97,10 +99,7 @@ ctf_bfdopen (struct bfd *abfd, int *errp)
     }
 
   ctfsect.cts_name = _CTF_SECTION;
-  ctfsect.cts_type = SHT_PROGBITS;
-  ctfsect.cts_flags = 0;
   ctfsect.cts_entsize = 1;
-  ctfsect.cts_offset = 0;
   ctfsect.cts_size = bfd_section_size (abfd, ctf_asect);
   ctfsect.cts_data = contents;
 
@@ -158,10 +157,8 @@ ctf_bfdopen_ctfsect (struct bfd *abfd _libctf_unused_,
            }
          strsect.cts_data = contents;
          strsect.cts_name = (char *) strsect.cts_data + strhdr->sh_name;
-         strsect.cts_type = strhdr->sh_type;
-         strsect.cts_flags = strhdr->sh_flags;
+         strsect.cts_size = bfd_section_size (abfd, str_asect);
          strsect.cts_entsize = strhdr->sh_size;
-         strsect.cts_offset = strhdr->sh_offset;
          strsectp = &strsect;
 
          if (!bfd_malloc_and_get_section (abfd, sym_asect, &contents))
@@ -172,11 +169,9 @@ ctf_bfdopen_ctfsect (struct bfd *abfd _libctf_unused_,
            }
 
          symsect.cts_name = (char *) strsect.cts_data + symhdr->sh_name;
-         symsect.cts_type = symhdr->sh_type;
-         symsect.cts_flags = symhdr->sh_flags;
          symsect.cts_entsize = symhdr->sh_size;
+         symsect.cts_size = bfd_section_size (abfd, sym_asect);
          symsect.cts_data = contents;
-         symsect.cts_offset = symhdr->sh_offset;
          symsectp = &symsect;
        }
     }
@@ -250,24 +245,27 @@ ctf_fdopen (int fd, const char *filename, const char *target, int *errp)
   if ((nbytes = ctf_pread (fd, &ctfhdr, sizeof (ctfhdr), 0)) <= 0)
     return (ctf_set_open_errno (errp, nbytes < 0 ? errno : ECTF_FMT));
 
-  /* If we have read enough bytes to form a CTF header and the magic
-     string matches, attempt to interpret the file as raw CTF.  */
+  /* If we have read enough bytes to form a CTF header and the magic string
+     matches, in either endianness, attempt to interpret the file as raw
+     CTF.  */
 
-  if ((size_t) nbytes >= sizeof (ctf_preamble_t) &&
-      ctfhdr.ctp_magic == CTF_MAGIC)
+  if ((size_t) nbytes >= sizeof (ctf_preamble_t)
+      && (ctfhdr.ctp_magic == CTF_MAGIC
+         || ctfhdr.ctp_magic == bswap_16 (CTF_MAGIC)))
     {
       ctf_file_t *fp = NULL;
       void *data;
 
-      if (ctfhdr.ctp_version > CTF_VERSION)
-       return (ctf_set_open_errno (errp, ECTF_CTFVERS));
-
       if ((data = ctf_mmap (st.st_size, 0, fd)) == NULL)
        return (ctf_set_open_errno (errp, errno));
 
       if ((fp = ctf_simple_open (data, (size_t) st.st_size, NULL, 0, 0,
                                 NULL, 0, errp)) == NULL)
-       ctf_munmap (data, (size_t) st.st_size);
+       {
+         ctf_munmap (data, (size_t) st.st_size);
+         return NULL;                  /* errno is set for us.  */
+       }
+
       fp->ctf_data_mmapped = data;
       fp->ctf_data_mmapped_len = (size_t) st.st_size;
 
@@ -277,7 +275,7 @@ ctf_fdopen (int fd, const char *filename, const char *target, int *errp)
   if ((nbytes = ctf_pread (fd, &arc_magic, sizeof (arc_magic), 0)) <= 0)
     return (ctf_set_open_errno (errp, nbytes < 0 ? errno : ECTF_FMT));
 
-  if ((size_t) nbytes >= sizeof (uint64_t) && arc_magic == CTFA_MAGIC)
+  if ((size_t) nbytes >= sizeof (uint64_t) && le64toh (arc_magic) == CTFA_MAGIC)
     {
       struct ctf_archive *arc;