libctf: don't dereference out-of-bounds locations in the qualifier hashtab

isqualifier, which is used by ctf_lookup_by_name to figure out if a
given word in a type name is a qualifier, takes the address of a
possibly out-of-bounds location before checking its bounds.

In any reasonable compiler this will just lead to a harmless address
computation that is then discarded if out-of-bounds, but it's still
undefined behaviour and the sanitizer rightly complains.

libctf/ChangeLog
2021-03-25  Nick Alcock  <nick.alcock@oracle.com>

	PR libctf/27628
	* ctf-lookup.c (isqualifier): Don't dereference out-of-bounds
	qhash values.
This commit is contained in:
Nick Alcock 2021-03-25 16:32:46 +00:00
parent 5226ef6113
commit 0bd65ce30a
2 changed files with 13 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2021-03-25 Nick Alcock <nick.alcock@oracle.com>
PR libctf/27628
* ctf-lookup.c (isqualifier): Don't dereference out-of-bounds
qhash values.
2021-03-25 Nick Alcock <nick.alcock@oracle.com>
* ctf-open-bfd.c (ctf_bfdopen_ctfsect): Initialize debugging.

View File

@ -111,10 +111,14 @@ isqualifier (const char *s, size_t len)
};
int h = s[len - 1] + (int) len - 105;
const struct qual *qp = &qhash[h];
const struct qual *qp;
return (h >= 0 && (size_t) h < sizeof (qhash) / sizeof (qhash[0])
&& (size_t) len == qp->q_len &&
if (h < 0 || (size_t) h >= sizeof (qhash) / sizeof (qhash[0]))
return 0;
qp = &qhash[h];
return ((size_t) len == qp->q_len &&
strncmp (qp->q_name, s, qp->q_len) == 0);
}