diff options
| author | Todd C. Miller <Todd.Miller@sudo.ws> | 2022-10-24 17:00:48 +0300 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-10-26 13:46:53 +0300 |
| commit | 428511ca66670e169a0e1b12e7540714b0be4cf8 (patch) | |
| tree | d816851c0dbc5ffc91b9493b8a9a7f441cb3b224 | |
| parent | e251e7ba1ce85d11f3c342b3ae1326a35b7d0b4a (diff) | |
ssl_cipher_process_rulestr: don't read outside rule_str buffer
If rule_str ended in a "-", "l" was incremented one byte past the
end of the buffer. This resulted in an out-of-bounds read when "l"
is dereferenced at the end of the loop. It is safest to just return
early in this case since the condition occurs inside a nested loop.
CLA: trivial
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19166)
| -rw-r--r-- | ssl/ssl_ciph.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 2ffad7008c..48aad6342b 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1062,9 +1062,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str, * alphanumeric, so we call this an error. */ ERR_raise(ERR_LIB_SSL, SSL_R_INVALID_COMMAND); - retval = found = 0; - l++; - break; + return 0; } if (rule == CIPHER_SPECIAL) { |