mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-23 14:42:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

QUIC: Ensure locking when injecting datagrams

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20348)
This commit is contained in:
Hugo Landau 2023-03-24 12:03:32 +00:00
parent 54b86b7fa3
commit 5129e59494
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ssl/quic/quic_impl.c
View File

@ -1419,23 +1419,33 @@ int ossl_quic_conn_stream_conclude(QUIC_CONNECTION *qc)
* SSL_inject_net_dgram
* --------------------
*/
QUIC_TAKES_LOCK
int SSL_inject_net_dgram(SSL *s, const unsigned char *buf,
size_t buf_len,
const BIO_ADDR *peer,
const BIO_ADDR *local)
{
int ret;
QUIC_CONNECTION *qc = QUIC_CONNECTION_FROM_SSL(s);
QUIC_DEMUX *demux;
if (!expect_quic_conn(qc))
return 0;
if (qc->ch == NULL)
return QUIC_RAISE_NON_NORMAL_ERROR(qc, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
NULL);
quic_lock(qc);
if (qc->ch == NULL) {
ret = QUIC_RAISE_NON_NORMAL_ERROR(qc, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
NULL);
goto err;
}
demux = ossl_quic_channel_get0_demux(qc->ch);
return ossl_quic_demux_inject(demux, buf, buf_len, peer, local);
ret = ossl_quic_demux_inject(demux, buf, buf_len, peer, local);
err:
quic_unlock(qc);
return ret;
}
/*