From nobody Sun Aug 20 19:22:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RTQV95DJvz4qbnX; Sun, 20 Aug 2023 19:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RTQV94c59z3Jf5; Sun, 20 Aug 2023 19:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692559345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8GH5YyFXBt9c9jT0tFvr4FvHoBsQBtsEVM1pdvtlRc=; b=UDdNtAo4z5P43PKGdhNHKxnk2yfhIKSw2ckTKFLMctIrQ3A83Z7RpYMsyDb3ge0ztHOrMb pR+A/eNDrs396vFPu+RY7ccNQ0uoGk6LUZK5z41OBUCaayBsRNXu+KZiL95tM1XTRMxmN1 w2i1XBZiLFTD840//P64VNeZOHhuDEm2L6ZuDmI6I+rnQy/tDpDNLEeLnUetChCuFJoJOj GyXw+MPxeK0tD7ocFiQ4A/wlDWS8el+7UF4fiPCom+SSTKxa13tcZT22QKinSw7gsavmew dXOYBlAyhMPkxRa7Wnf2KmZ0BAaMEAKEyGSrg+hux+k0DAO+sWkGjuYGhV7gEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692559345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8GH5YyFXBt9c9jT0tFvr4FvHoBsQBtsEVM1pdvtlRc=; b=YbVwjaQUPWsbNI0gYX+8pRjb0h9SfNzkYI4jVsqf7hJ3t5w7zsoNB8IR/0sx+ZxdA/3QBi QJM79oUyTPzbcL7bmjbidI8GOEWnfbNgZhA5QUNwgnALnv8dYZwFNh/l/IUYOk2inYWoI9 GcVqvHTB37fnkdCmQQGkyzAxs1lSC59DQBh2NlWV6I8FCcdJZQMsVn62HXvCWtIccl8b80 7v+FfF5NuztFVZQmeTOSn6xi/SyNqUhAE1wHNjz4gONMuRCCmnsdPna7hYk7h5zOFzCtiR Uu2GWJaNNO+BfsXtKEqEiQp6pB2iACjRTFS3YSoSdEO7CKnu6sg+HOuMh1X+8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692559345; a=rsa-sha256; cv=none; b=aBRpL1cGlrA0wpqRtDwmvKkbYYugr07Nh1AbISUxQ48fGqRPYtuVU3kJOtWbVZ+FFp0ytL qcNA0vrlboyqgXf3pBrLbY/3y8tzx7ylFIXkG7REKHzYdtLXmrXKXnczpy85fkR0OUE99Z uTkHKNXecP3aLilNTEqFmwdxa9p+JkToXO1PpV3Virx5d36/7McgWYiGN9424EzWoPuSVM ndRUrxjS87UwkNJ/nWMSoPumvte7TuS/V2iE7m7lb4CYhtT042ylOFAMAOLIgSO+o4KEWM aWzL+UuFt7uF0RsTfDBXgz+P2Qh4HizSW4+SqxBQru/8g3DOPRz6pevsFEQDZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RTQV93fjWzrHr; Sun, 20 Aug 2023 19:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37KJMPpQ025554; Sun, 20 Aug 2023 19:22:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37KJMPG1025551; Sun, 20 Aug 2023 19:22:25 GMT (envelope-from git) Date: Sun, 20 Aug 2023 19:22:25 GMT Message-Id: <202308201922.37KJMPG1025551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1b91d634a58c - main - ssh: fix OpenSSH 9.4 regression with multiplexed sessions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b91d634a58c45d7b33dee044034260f747c80d9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1b91d634a58c45d7b33dee044034260f747c80d9 commit 1b91d634a58c45d7b33dee044034260f747c80d9 Author: Ed Maste AuthorDate: 2023-08-20 19:16:54 +0000 Commit: Ed Maste CommitDate: 2023-08-20 19:20:49 +0000 ssh: fix OpenSSH 9.4 regression with multiplexed sessions Upstream commit message: upstream: fix regression in OpenSSH 9.4 (mux.c r1.99) that caused multiplexed sessions to ignore SIGINT under some circumstances. Reported by / feedback naddy@, ok dtucker@ OpenBSD-Commit-ID: 4d5c6c894664f50149153fd4764f21f43e7d7e5a Fixes: 535af610a4fd ("ssh: Update to OpenSSH 9.4p1") Obtained from: OpenSSH 803e22eabd3b Sponsored by: The FreeBSD Foundation --- crypto/openssh/kex.c | 4 ++-- crypto/openssh/misc.c | 42 ++++++++++++++++++++++++++++++------------ crypto/openssh/misc.h | 5 +++-- crypto/openssh/mux.c | 6 ++++-- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/crypto/openssh/kex.c b/crypto/openssh/kex.c index b4e2ab75f541..fd04bb0b5c10 100644 --- a/crypto/openssh/kex.c +++ b/crypto/openssh/kex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.178 2023/03/12 10:40:39 dtucker Exp $ */ +/* $OpenBSD: kex.c,v 1.179 2023/08/18 01:37:41 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -1334,7 +1334,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, for (;;) { if (timeout_ms > 0) { r = waitrfd(ssh_packet_get_connection_in(ssh), - &timeout_ms); + &timeout_ms, NULL); if (r == -1 && errno == ETIMEDOUT) { send_error(ssh, "Timed out waiting " "for SSH identification string."); diff --git a/crypto/openssh/misc.c b/crypto/openssh/misc.c index 4b87c4090804..956587035517 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.185 2023/08/04 06:32:40 dtucker Exp $ */ +/* $OpenBSD: misc.c,v 1.186 2023/08/18 01:37:41 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005-2020 Damien Miller. All rights reserved. @@ -313,20 +313,38 @@ set_sock_tos(int fd, int tos) * Returns 0 if fd ready or -1 on timeout or error (see errno). */ static int -waitfd(int fd, int *timeoutp, short events) +waitfd(int fd, int *timeoutp, short events, volatile sig_atomic_t *stop) { struct pollfd pfd; - struct timeval t_start; - int oerrno, r, have_timeout = (*timeoutp >= 0); + struct timespec timeout; + int oerrno, r; + sigset_t nsigset, osigset; + if (timeoutp && *timeoutp == -1) + timeoutp = NULL; pfd.fd = fd; pfd.events = events; - for (; !have_timeout || *timeoutp >= 0;) { - monotime_tv(&t_start); - r = poll(&pfd, 1, *timeoutp); + ptimeout_init(&timeout); + if (timeoutp != NULL) + ptimeout_deadline_ms(&timeout, *timeoutp); + if (stop != NULL) + sigfillset(&nsigset); + for (; timeoutp == NULL || *timeoutp >= 0;) { + if (stop != NULL) { + sigprocmask(SIG_BLOCK, &nsigset, &osigset); + if (*stop) { + sigprocmask(SIG_SETMASK, &osigset, NULL); + errno = EINTR; + return -1; + } + } + r = ppoll(&pfd, 1, ptimeout_get_tsp(&timeout), + stop != NULL ? &osigset : NULL); oerrno = errno; - if (have_timeout) - ms_subtract_diff(&t_start, timeoutp); + if (stop != NULL) + sigprocmask(SIG_SETMASK, &osigset, NULL); + if (timeoutp) + *timeoutp = ptimeout_get_ms(&timeout); errno = oerrno; if (r > 0) return 0; @@ -346,8 +364,8 @@ waitfd(int fd, int *timeoutp, short events) * Returns 0 if fd ready or -1 on timeout or error (see errno). */ int -waitrfd(int fd, int *timeoutp) { - return waitfd(fd, timeoutp, POLLIN); +waitrfd(int fd, int *timeoutp, volatile sig_atomic_t *stop) { + return waitfd(fd, timeoutp, POLLIN, stop); } /* @@ -381,7 +399,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr, break; } - if (waitfd(sockfd, timeoutp, POLLIN | POLLOUT) == -1) + if (waitfd(sockfd, timeoutp, POLLIN | POLLOUT, NULL) == -1) return -1; /* Completed or failed */ diff --git a/crypto/openssh/misc.h b/crypto/openssh/misc.h index fd77a7fd7273..f9bdc6eb51bd 100644 --- a/crypto/openssh/misc.h +++ b/crypto/openssh/misc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.103 2023/07/19 14:02:27 djm Exp $ */ +/* $OpenBSD: misc.h,v 1.104 2023/08/18 01:37:41 djm Exp $ */ /* * Author: Tatu Ylonen @@ -19,6 +19,7 @@ #include #include #include +#include /* Data structure for representing a forwarding request. */ struct Forward { @@ -57,7 +58,7 @@ char *get_rdomain(int); int set_rdomain(int, const char *); int get_sock_af(int); void set_sock_tos(int, int); -int waitrfd(int, int *); +int waitrfd(int, int *, volatile sig_atomic_t *); int timeout_connect(int, const struct sockaddr *, socklen_t, int *); int a2port(const char *); int a2tun(const char *, int *); diff --git a/crypto/openssh/mux.c b/crypto/openssh/mux.c index 3a0f87674b95..d9d5e7d994ca 100644 --- a/crypto/openssh/mux.c +++ b/crypto/openssh/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.99 2023/08/04 06:32:40 dtucker Exp $ */ +/* $OpenBSD: mux.c,v 1.100 2023/08/18 01:37:41 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller * @@ -1480,7 +1480,9 @@ mux_client_read(int fd, struct sshbuf *b, size_t need, int timeout_ms) case EWOULDBLOCK: #endif case EAGAIN: - if (waitrfd(fd, &timeout_ms) == -1) + if (waitrfd(fd, &timeout_ms, + &muxclient_terminate) == -1 && + errno != EINTR) return -1; /* timeout */ /* FALLTHROUGH */ case EINTR: