Skip to content

Remove session use-after free #6574

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

Closed
shinrich wants to merge 1 commit into from
+2 −11
Closed

Remove session use-after free #6574

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
1 change: 1 addition & 0 deletions iocore/net/UnixNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ read_signal_and_update(int event, UnixNetVConnection *vc)
case VC_EVENT_ERROR:
case VC_EVENT_ACTIVE_TIMEOUT:
case VC_EVENT_INACTIVITY_TIMEOUT:
Warning("Closing orphaned vc %p", vc);
Debug("inactivity_cop", "event %d: null read.vio cont, closing vc %p", event, vc);
vc->closed = 1;
break;
Expand Down
8 changes: 0 additions & 8 deletions proxy/http/Http1ClientSession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,6 @@ Http1ClientSession::state_wait_for_close(int event, void *data)
case VC_EVENT_INACTIVITY_TIMEOUT:
half_close = false;
this->do_io_close();
if (client_vc != nullptr) {
client_vc->do_io_close();
client_vc = nullptr;
}
break;
case VC_EVENT_READ_READY:
// Drain any data read
Expand Down Expand Up @@ -396,10 +392,6 @@ Http1ClientSession::state_keep_alive(int event, void *data)

case VC_EVENT_EOS:
this->do_io_close();
if (client_vc != nullptr) {
client_vc->do_io_close();
client_vc = nullptr;
}
break;

case VC_EVENT_READ_COMPLETE:
Expand Down
4 changes: 1 addition & 3 deletions proxy/http/Http1ServerSession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,7 @@ Http1ServerSession::release()
return;
}

// Make sure the vios for the current SM are cleared
server_vc->do_io_read(nullptr, 0, nullptr);
server_vc->do_io_write(nullptr, 0, nullptr);
// release_session or do_io_close will clear the IO operations from the SM

HSMresult_t r = httpSessionManager.release_session(this);

Expand Down