[openssh-commits] [openssh] branch master updated (c4902e1a -> 7be4ac81)

git+noreply at mindrot.org git+noreply at mindrot.org
Wed May 19 11:52:33 AEST 2021


This is an automated email from the git hooks/post-receive script.

djm pushed a change to branch master
in repository openssh.

      from  c4902e1a  upstream: fix breakage of -W forwaring introduced in 1.554; reported by
       new  7be4ac81  upstream: restore blocking status on stdio fds before close

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit 7be4ac813662f68e89f23c50de058a49aa32f7e4
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Wed May 19 01:24:05 2021 +0000

    upstream: restore blocking status on stdio fds before close
    
    ssh(1) needs to set file descriptors to non-blocking mode to operate
    but it was not restoring the original state on exit. This could cause
    problems with fds shared with other programs via the shell, e.g.
    
    > $ cat > test.sh << _EOF
    > #!/bin/sh
    > {
    >         ssh -Fnone -oLogLevel=verbose ::1 hostname
    >         cat /usr/share/dict/words
    > } | sleep 10
    > _EOF
    > $ ./test.sh
    > Authenticated to ::1 ([::1]:22).
    > Transferred: sent 2352, received 2928 bytes, in 0.1 seconds
    > Bytes per second: sent 44338.9, received 55197.4
    > cat: stdout: Resource temporarily unavailable
    
    This restores the blocking status for fds 0,1,2 (stdio) before ssh(1)
    abandons/closes them.
    
    This was reported as bz3280 and GHPR246; ok dtucker@
    
    OpenBSD-Commit-ID: 8cc67346f05aa85a598bddf2383fcfcc3aae61ce

Summary of changes:
 channels.c   | 67 ++++++++++++++++++++++++++++++++++++++++++------------------
 channels.h   | 17 ++++++++++++---
 clientloop.c | 10 +--------
 mux.c        | 21 ++++---------------
 nchan.c      |  8 ++++----
 ssh.c        | 17 +++++----------
 6 files changed, 75 insertions(+), 65 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list