[openssh-commits] [openssh] branch master updated (b05fda22 -> 29fb6f6d)

[git+noreply at mindrot.org]

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

djm pushed a change to branch master
in repository openssh.

    from b05fda22 Check for SA_RESTART before using it.
     new a9b90859 upstream: fix double word; ok dtucker@
     new 53d1d307 upstream: mention mux proxy mode
     new 29fb6f6d upstream: Fix proxy multiplexing (-O proxy) bug

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


Detailed log of new commits:

commit 29fb6f6d46b67770084b4f12bcf8a01bd535041b
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Jul 25 22:40:08 2024 +0000

    upstream: Fix proxy multiplexing (-O proxy) bug
    
    If a mux started with ControlPersist then later has a forwarding added using
    mux proxy connection and the forwarding was used, then when the mux proxy
    session terminates, the mux master process will send a channel close to the
    server with a bad channel ID and crash the connection.
    
    This was caused by my stupidly reusing c->remote_id for mux channel
    associations when I should have just added another member to struct channel.
    
    ok markus@
    
    OpenBSD-Commit-ID: c9f474e0124e3fe456c5e43749b97d75e65b82b2

commit 53d1d307438517805989c7d5616d752739a97e03
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Jul 18 01:47:27 2024 +0000

    upstream: mention mux proxy mode
    
    OpenBSD-Commit-ID: fd77a77779f06d316a314e4540dc57c93fc3369a

commit a9b90859d252c2f5a24142f985d38610ac74685f
Author: jsg at openbsd.org <jsg at openbsd.org>
Date:   Sun Jul 14 10:19:23 2024 +0000

    upstream: fix double word; ok dtucker@
    
    OpenBSD-Commit-ID: e6aff005914fa350b896d2be030be3d3b56ec0e8

Summary of changes:
 channels.c   |  8 +++++---
 channels.h   |  4 +++-
 mux.c        | 28 ++++++++++++++--------------
 nchan.c      |  6 ++++--
 ssh.1        |  6 ++++--
 ssh_config.5 |  6 +++---
 6 files changed, 33 insertions(+), 25 deletions(-)

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