Skip to content

Fix a potential crash due to use-after-free on QUIC connections #9715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maskit merged 1 commit into from
May 23, 2023
Merged

Fix a potential crash due to use-after-free on QUIC connections #9715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions iocore/net/P_QUICNetVConnection_quiche.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,11 @@ class QUICNetVConnection : public UnixNetVConnection,
void _close_packet_write_ready(Event *data);
Event *_packet_write_ready = nullptr;

void _schedule_quiche_timeout();
void _unschedule_quiche_timeout();
void _close_quiche_timeout(Event *data);
Event *_quiche_timeout = nullptr;

void _handle_read_ready();
void _handle_write_ready();
void _handle_interval();
Expand Down
34 changes: 32 additions & 2 deletions iocore/net/QUICNetVConnection_quiche.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ QUICNetVConnection::free(EThread *t)
this->_udp_con = nullptr;

quiche_conn_free(this->_quiche_con);
this->_quiche_con = nullptr;

this->_unschedule_quiche_timeout();
this->_unschedule_packet_write_ready();

delete this->_application_map;
this->_application_map = nullptr;
Expand Down Expand Up @@ -150,6 +154,7 @@ QUICNetVConnection::state_handshake(int event, Event *data)
this->_schedule_packet_write_ready(true);
break;
case EVENT_INTERVAL:
this->_close_quiche_timeout(data);
this->_handle_interval();
break;
case VC_EVENT_EOS:
Expand Down Expand Up @@ -181,6 +186,7 @@ QUICNetVConnection::state_established(int event, Event *data)
this->_schedule_packet_write_ready(true);
break;
case EVENT_INTERVAL:
this->_close_quiche_timeout(data);
this->_handle_interval();
break;
case VC_EVENT_EOS:
Expand Down Expand Up @@ -309,7 +315,7 @@ QUICNetVConnection::acceptEvent(int event, Event *e)
action_.continuation->handleEvent(NET_EVENT_ACCEPT, this);
this->_schedule_packet_write_ready();

this->thread->schedule_in(this, HRTIME_MSECONDS(quiche_conn_timeout_as_millis(this->_quiche_con)));
this->_schedule_quiche_timeout();

return EVENT_DONE;
}
Expand Down Expand Up @@ -550,6 +556,30 @@ QUICNetVConnection::_close_packet_write_ready(Event *data)
this->_packet_write_ready = nullptr;
}

void
QUICNetVConnection::_schedule_quiche_timeout()
{
if (!this->_quiche_timeout) {
this->_quiche_timeout = this->thread->schedule_in(this, HRTIME_MSECONDS(quiche_conn_timeout_as_millis(this->_quiche_con)));
}
}

void
QUICNetVConnection::_unschedule_quiche_timeout()
{
if (this->_quiche_timeout) {
this->_quiche_timeout->cancel();
this->_quiche_timeout = nullptr;
}
}

void
QUICNetVConnection::_close_quiche_timeout(Event *data)
{
ink_assert(this->_quiche_timeout == data);
this->_quiche_timeout = nullptr;
}

void
QUICNetVConnection::_handle_read_ready()
{
Expand Down Expand Up @@ -649,7 +679,7 @@ QUICNetVConnection::_handle_interval()

} else {
// Just schedule timeout event again if the connection is still open
this->thread->schedule_in(this, HRTIME_MSECONDS(quiche_conn_timeout_as_millis(this->_quiche_con)));
this->_schedule_quiche_timeout();
}
}

Expand Down