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

ctf segfaults

Browse Source 
PR 30228
	PR 30229
	* ctf-open.c (ctf_bufopen_internal): Check for NULL cts_data.
	* ctf-archive.c (ctf_arc_bufpreamble, ctf_arc_bufopen): Likewise.
This commit is contained in:
Alan Modra
2023-03-17 21:09:31 +10:30
parent 52435e5ff6
commit 027333da75
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libctf/ctf-archive.c
View File

@@ -402,8 +402,9 @@ ctf_arc_symsect_endianness (ctf_archive_t *arc, int little_endian)
const ctf_preamble_t * const ctf_preamble_t *
ctf_arc_bufpreamble (const ctf_sect_t *ctfsect) ctf_arc_bufpreamble (const ctf_sect_t *ctfsect)
{ {
if (ctfsect->cts_size > sizeof (uint64_t) && if (ctfsect->cts_data != NULL
(le64toh ((*(uint64_t *) ctfsect->cts_data)) == CTFA_MAGIC)) && ctfsect->cts_size > sizeof (uint64_t)
&& (le64toh ((*(uint64_t *) ctfsect->cts_data)) == CTFA_MAGIC))
{ {
struct ctf_archive *arc = (struct ctf_archive *) ctfsect->cts_data; struct ctf_archive *arc = (struct ctf_archive *) ctfsect->cts_data;
return (const ctf_preamble_t *) ((char *) arc + le64toh (arc->ctfa_ctfs) return (const ctf_preamble_t *) ((char *) arc + le64toh (arc->ctfa_ctfs)
@@ -424,8 +425,9 @@ ctf_arc_bufopen (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect,
int is_archive; int is_archive;
ctf_dict_t *fp = NULL; ctf_dict_t *fp = NULL;
if (ctfsect->cts_size > sizeof (uint64_t) && if (ctfsect->cts_data != NULL
(le64toh ((*(uint64_t *) ctfsect->cts_data)) == CTFA_MAGIC)) && ctfsect->cts_size > sizeof (uint64_t)
&& (le64toh ((*(uint64_t *) ctfsect->cts_data)) == CTFA_MAGIC))
{ {
/* The archive is mmappable, so this operation is trivial. /* The archive is mmappable, so this operation is trivial.

3
libctf/ctf-open.c
View File

@@ -1354,7 +1354,8 @@ ctf_bufopen_internal (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect,
if (strsect != NULL && strsect->cts_data == NULL) if (strsect != NULL && strsect->cts_data == NULL)
return (ctf_set_open_errno (errp, ECTF_STRBAD)); return (ctf_set_open_errno (errp, ECTF_STRBAD));
if (ctfsect->cts_size < sizeof (ctf_preamble_t)) if (ctfsect->cts_data == NULL
|| ctfsect->cts_size < sizeof (ctf_preamble_t))
return (ctf_set_open_errno (errp, ECTF_NOCTFBUF)); return (ctf_set_open_errno (errp, ECTF_NOCTFBUF));
pp = (const ctf_preamble_t *) ctfsect->cts_data; pp = (const ctf_preamble_t *) ctfsect->cts_data;