diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2024-06-11 02:44:52 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-06-11 03:26:51 +0200 |
| commit | 41987efd356d3fc30139aeab4b09374acf8f91a0 (patch) | |
| tree | 9dfa722b36c3037841021f8e430e30f5e0ea5f7d /monitor_wrap.c | |
| parent | upstream: log waitpid() status for abnormal exits (diff) | |
| download | openssh-41987efd356d3fc30139aeab4b09374acf8f91a0.tar.xz openssh-41987efd356d3fc30139aeab4b09374acf8f91a0.zip | |
upstream: reap the [net] child if it hangs up while writing privsep
message payloads, not just the message header
OpenBSD-Commit-ID: 24dbd400aa381ac96be7ed2dd49018487dfef6ce
Diffstat (limited to 'monitor_wrap.c')
| -rw-r--r-- | monitor_wrap.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index b0a5a5cfa..2b5438527 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.c,v 1.132 2024/06/11 00:40:21 djm Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.133 2024/06/11 00:44:52 djm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -175,7 +175,7 @@ mm_request_receive(int sock, struct sshbuf *m) { u_char buf[4], *p = NULL; u_int msg_len; - int r; + int oerrno, r; debug3_f("entering"); @@ -193,8 +193,13 @@ mm_request_receive(int sock, struct sshbuf *m) sshbuf_reset(m); if ((r = sshbuf_reserve(m, msg_len, &p)) != 0) fatal_fr(r, "reserve"); - if (atomicio(read, sock, p, msg_len) != msg_len) - fatal_f("read: %s", strerror(errno)); + if (atomicio(read, sock, p, msg_len) != msg_len) { + oerrno = errno; + error_f("read: %s", strerror(errno)); + if (oerrno == EPIPE) + mm_reap(); + cleanup_exit(255); + } } void |