ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-21 14:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ssh_terminal: close terminal fd in pthread context

Browse Source 
Issue #3682
This commit is contained in:
Alexander Boettcher 2020-11-27 14:12:27 +01:00 committed by Norman Feske
parent 3fac8b106d
commit b6408cec1c
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
repos/gems/src/server/ssh_terminal/server.cc
View File

@ -374,20 +374,13 @@ void Ssh::Server::detach_terminal(Ssh::Terminal &conn)
Genode::error("could not detach Terminal for user ", conn.user());
return;
}
auto invalidate_terminal = [&] (Session &sess) {
Libc::with_libc([&] () {
if (sess.terminal != &conn) { return; }
sess.terminal = nullptr;
sess.terminal_detached = true;
});
auto invalidate_terminal = [&] (Session &sess) {
if (sess.terminal != &conn) { return; }
sess.terminal_detached = true;
};
_sessions.for_each(invalidate_terminal);
Libc::with_libc([&] () {
Genode::destroy(&_heap, p);
});
_wake_loop();
}
@ -599,6 +592,20 @@ void Ssh::Server::loop()
/* first remove all stale sessions */
auto cleanup = [&] (Session &s) {
if (s.terminal_detached) {
Terminal_session *p = nullptr;
auto lookup = [&] (Terminal_session &t) {
if (&t.conn == s.terminal) {
p = &t;
s.terminal = nullptr;
}
};
_terminals.for_each(lookup);
if (p)
Genode::destroy(&_heap, p);
}
if (!s.terminal_detached
&& ssh_is_connected(s.session)) { return ; }
_cleanup_session(s);