mirror of
https://github.com/openssl/openssl.git
synced 2025-01-24 19:04:03 +08:00
Fix off-by-1 bug on provider_activate with custom error strings
Starting `cnt` from 1 would work if we weren't using cnt itself to access elements of the array returned calling the provider callback. As it is before this commit, we have 2 problems: - first, in the unlikely case that the incoming array was "empty" (only contains the terminator item) we would skip past it and potentially end up with oob reads; - otherwise, at the end of the while loop, `cnt` will be equal to the number of items in the input array, not 1 more. We then add 1 more to the zalloc call to account for the library name item, and we fill all of it (relying on zalloc to have zeroed the terminator item). The first read access that will read the list up to the terminator will result in a OOB read as we did not allocate enough space to also contain the terminator. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/11427)
This commit is contained in:
parent
551543e5e2
commit
fd03868b34
@ -540,12 +540,13 @@ static int provider_activate(OSSL_PROVIDER *prov)
|
||||
* with the error library number, so we need to make a copy of that
|
||||
* array either way.
|
||||
*/
|
||||
cnt = 1; /* One for the terminating item */
|
||||
cnt = 0;
|
||||
while (reasonstrings[cnt].id != 0) {
|
||||
if (ERR_GET_LIB(reasonstrings[cnt].id) != 0)
|
||||
return 0;
|
||||
cnt++;
|
||||
}
|
||||
cnt++; /* One for the terminating item */
|
||||
|
||||
/* Allocate one extra item for the "library" name */
|
||||
prov->error_strings =
|
||||
|
Loading…
Reference in New Issue
Block a user