RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-04-11 03:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: sshd listener must not block if reexecd sshd exits

Browse Source 
in write(2) on config_s[0] if the forked child exits early before finishing
recv_rexec_state (e.g. with fatal()) because config_s[1] stays open in the
parent. this prevents the parent from accepting new connections. ok djm,
deraadt

OpenBSD-Commit-ID: 92ccfeb939ccd55bda914dc3fe84582158c4a9ef
This commit is contained in:
markus@openbsd.org 2020-05-15 08:34:03 +00:00 committed by Damien Miller
parent af8b16fb2c
commit 4b307faf2f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sshd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshd.c,v 1.553 2020/05/08 05:13:14 djm Exp $ */ /* $OpenBSD: sshd.c,v 1.554 2020/05/15 08:34:03 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1270,6 +1270,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
startup_pipe = -1; startup_pipe = -1;
pid = getpid(); pid = getpid();
if (rexec_flag) { if (rexec_flag) {
close(config_s[1]);
send_rexec_state(config_s[0], cfg); send_rexec_state(config_s[0], cfg);
close(config_s[0]); close(config_s[0]);
} }
@ -1328,9 +1329,9 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
close(startup_p[1]); close(startup_p[1]);
if (rexec_flag) { if (rexec_flag) {
close(config_s[1]);
send_rexec_state(config_s[0], cfg); send_rexec_state(config_s[0], cfg);
close(config_s[0]); close(config_s[0]);
close(config_s[1]);
} }
close(*newsock); close(*newsock);