Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

libctf: open-bfd: open BTF dicts

Browse Source 
Teaching ctf_open and ctf_fdopen to open BTF dicts if passed is quite
simple: we just need to check the magic number and allow BTF dicts
into the lower-level ctf_simple_open machinery (which ultimately
calls ctf_bufopen).
This commit is contained in:
Nick Alcock
2025-04-25 18:26:45 +01:00
parent 0a283f3d7a
commit 27d5d0ccc7
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libctf/ctf-open-bfd.c
View File

@@ -56,7 +56,8 @@ ctf_bfdopen (struct bfd *abfd, int *errp)
libctf_init_debug();
if ((ctf_asect = bfd_get_section_by_name (abfd, _CTF_SECTION)) == NULL)
if (((ctf_asect = bfd_get_section_by_name (abfd, _CTF_SECTION)) == NULL)
&& ((ctf_asect = bfd_get_section_by_name (abfd, ".BTF")) == NULL))
{
return (ctf_set_open_errno (errp, ECTF_NOCTFDATA));
}
@@ -257,26 +258,32 @@ ctf_fdopen (int fd, const char *filename, const char *target, int *errp)
struct stat st;
ssize_t nbytes;
ctf_preamble_t ctfhdr;
ctf_preamble_v3_t *ctfhdr;
ctf_btf_preamble_t btfhdr;
uint64_t arc_magic;
memset (&ctfhdr, 0, sizeof (ctfhdr));
memset (&btfhdr, 0, sizeof (btfhdr));
libctf_init_debug();
if (fstat (fd, &st) == -1)
return (ctf_set_open_errno (errp, errno));
if ((nbytes = ctf_pread (fd, &ctfhdr, sizeof (ctfhdr), 0)) <= 0)
if ((nbytes = ctf_pread (fd, &btfhdr, sizeof (btfhdr) > sizeof (ctfhdr)
? sizeof (btfhdr) : sizeof (ctfhdr), 0)) <= 0)
return (ctf_set_open_errno (errp, nbytes < 0 ? errno : ECTF_FMT));
ctfhdr = (ctf_preamble_v3_t *) &btfhdr;
/* 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 we have read enough bytes to form a CTF or BTF header and the magic
string matches, in either endianness, attempt to interpret the file as raw
CTF/BTF. */
if ((size_t) nbytes >= sizeof (ctf_preamble_t)
&& (ctfhdr.ctp_magic == CTF_MAGIC
|| ctfhdr.ctp_magic == bswap_16 (CTF_MAGIC)))
if (((size_t) nbytes >= sizeof (ctf_preamble_v3_t)
&& (ctfhdr->ctp_magic == CTF_MAGIC
|| ctfhdr->ctp_magic == bswap_16 (CTF_MAGIC)))
|| ((size_t) nbytes >= sizeof (ctf_btf_preamble_t)
&& (btfhdr.btf_magic == CTF_BTF_MAGIC
|| btfhdr.btf_magic == bswap_16 (CTF_BTF_MAGIC))))
{
ctf_dict_t *fp = NULL;
void *data;