From f4e67c0ad259b4cf10177277a5827fa5545bac53 Mon Sep 17 00:00:00 2001 From: "markus@openbsd.org" Date: Wed, 4 May 2022 07:31:22 +0000 Subject: [PATCH] upstream: make sure stdout is non-blocking; ok djm@ OpenBSD-Commit-ID: 64940fffbd1b882eda2d7c8c7a43c79368309c0d --- channels.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/channels.c b/channels.c index 12f765997..8a8a2c7eb 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.417 2022/04/20 04:19:11 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.418 2022/05/04 07:31:22 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -304,6 +304,8 @@ static void channel_register_fds(struct ssh *ssh, Channel *c, int rfd, int wfd, int efd, int extusage, int nonblock, int is_tty) { + int val; + if (rfd != -1) fcntl(rfd, F_SETFD, FD_CLOEXEC); if (wfd != -1 && wfd != rfd) @@ -333,15 +335,18 @@ channel_register_fds(struct ssh *ssh, Channel *c, int rfd, int wfd, int efd, * restore their blocking state on exit to avoid interfering * with other programs that follow. */ - if (rfd != -1 && !isatty(rfd) && fcntl(rfd, F_GETFL) == 0) { + if (rfd != -1 && !isatty(rfd) && + (val = fcntl(rfd, F_GETFL)) != -1 && !(val & O_NONBLOCK)) { c->restore_block |= CHANNEL_RESTORE_RFD; set_nonblock(rfd); } - if (wfd != -1 && !isatty(wfd) && fcntl(wfd, F_GETFL) == 0) { + if (wfd != -1 && !isatty(wfd) && + (val = fcntl(wfd, F_GETFL)) != -1 && !(val & O_NONBLOCK)) { c->restore_block |= CHANNEL_RESTORE_WFD; set_nonblock(wfd); } - if (efd != -1 && !isatty(efd) && fcntl(efd, F_GETFL) == 0) { + if (efd != -1 && !isatty(efd) && + (val = fcntl(efd, F_GETFL)) != -1 && !(val & O_NONBLOCK)) { c->restore_block |= CHANNEL_RESTORE_EFD; set_nonblock(efd); }