QUIC NULL checks
- Fixes https://scan5.scan.coverity.com/#/project-view/62507/10222?selectedIssue=1643029 - Fixes https://scan5.scan.coverity.com/#/project-view/62507/10222?selectedIssue=1643030 - Fixes https://scan5.scan.coverity.com/#/project-view/62507/10222?selectedIssue=1643141 Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26916)
This commit is contained in:
parent
9688973596
commit
442f1958e8
2 changed files with 6 additions and 8 deletions
|
@ -4543,6 +4543,7 @@ SSL *ossl_quic_accept_connection(SSL *ssl, uint64_t flags)
|
||||||
int ret;
|
int ret;
|
||||||
QCTX ctx;
|
QCTX ctx;
|
||||||
SSL *conn_ssl = NULL;
|
SSL *conn_ssl = NULL;
|
||||||
|
SSL_CONNECTION *conn = NULL;
|
||||||
QUIC_CHANNEL *new_ch = NULL;
|
QUIC_CHANNEL *new_ch = NULL;
|
||||||
QUIC_CONNECTION *qc;
|
QUIC_CONNECTION *qc;
|
||||||
int no_block = ((flags & SSL_ACCEPT_CONNECTION_NO_BLOCK) != 0);
|
int no_block = ((flags & SSL_ACCEPT_CONNECTION_NO_BLOCK) != 0);
|
||||||
|
@ -4578,8 +4579,6 @@ SSL *ossl_quic_accept_connection(SSL *ssl, uint64_t flags)
|
||||||
ossl_quic_reactor_tick(ossl_quic_engine_get0_reactor(ctx.ql->engine), 0);
|
ossl_quic_reactor_tick(ossl_quic_engine_get0_reactor(ctx.ql->engine), 0);
|
||||||
|
|
||||||
new_ch = ossl_quic_port_pop_incoming(ctx.ql->port);
|
new_ch = ossl_quic_port_pop_incoming(ctx.ql->port);
|
||||||
if (new_ch == NULL)
|
|
||||||
goto out;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -4587,11 +4586,10 @@ SSL *ossl_quic_accept_connection(SSL *ssl, uint64_t flags)
|
||||||
* created channel, so once we pop the new channel from the port above
|
* created channel, so once we pop the new channel from the port above
|
||||||
* we just need to extract it
|
* we just need to extract it
|
||||||
*/
|
*/
|
||||||
conn_ssl = ossl_quic_channel_get0_tls(new_ch);
|
if (new_ch == NULL
|
||||||
if (conn_ssl == NULL)
|
|| (conn_ssl = ossl_quic_channel_get0_tls(new_ch)) == NULL
|
||||||
goto out;
|
|| (conn = SSL_CONNECTION_FROM_SSL(conn_ssl)) == NULL
|
||||||
conn_ssl = SSL_CONNECTION_GET_USER_SSL(SSL_CONNECTION_FROM_SSL(conn_ssl));
|
|| (conn_ssl = SSL_CONNECTION_GET_USER_SSL(conn)) == NULL)
|
||||||
if (conn_ssl == NULL)
|
|
||||||
goto out;
|
goto out;
|
||||||
qc = (QUIC_CONNECTION *)conn_ssl;
|
qc = (QUIC_CONNECTION *)conn_ssl;
|
||||||
qc->listener = ctx.ql;
|
qc->listener = ctx.ql;
|
||||||
|
|
|
@ -917,7 +917,7 @@ int ossl_quic_tls_set_early_data_enabled(QUIC_TLS *qtls, int enabled)
|
||||||
{
|
{
|
||||||
SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(qtls->args.s);
|
SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(qtls->args.s);
|
||||||
|
|
||||||
if (!SSL_IS_QUIC_HANDSHAKE(sc) || !SSL_in_before(qtls->args.s))
|
if (sc == NULL || !SSL_IS_QUIC_HANDSHAKE(sc) || !SSL_in_before(qtls->args.s))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!enabled) {
|
if (!enabled) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue