mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-21 02:06:37 +00:00
f374ba41f5
Release notes are available at https://www.openssh.com/txt/release-9.2 OpenSSH 9.2 contains fixes for two security problems and a memory safety problem. The memory safety problem is not believed to be exploitable. These fixes have already been committed to OpenSSH 9.1 in FreeBSD. Some other notable items from the release notes: * ssh(1): add a new EnableEscapeCommandline ssh_config(5) option that controls whether the client-side ~C escape sequence that provides a command-line is available. Among other things, the ~C command-line could be used to add additional port-forwards at runtime. * sshd(8): add support for channel inactivity timeouts via a new sshd_config(5) ChannelTimeout directive. This allows channels that have not seen traffic in a configurable interval to be automatically closed. Different timeouts may be applied to session, X11, agent and TCP forwarding channels. * sshd(8): add a sshd_config UnusedConnectionTimeout option to terminate client connections that have no open channels for a length of time. This complements the ChannelTimeout option above. * sshd(8): add a -V (version) option to sshd like the ssh client has. * scp(1), sftp(1): add a -X option to both scp(1) and sftp(1) to allow control over some SFTP protocol parameters: the copy buffer length and the number of in-flight requests, both of which are used during upload/download. Previously these could be controlled in sftp(1) only. This makes them available in both SFTP protocol clients using the same option character sequence. * ssh-keyscan(1): allow scanning of complete CIDR address ranges, e.g. "ssh-keyscan 192.168.0.0/24". If a CIDR range is passed, then it will be expanded to all possible addresses in the range including the all-0s and all-1s addresses. bz#976 * ssh(1): support dynamic remote port forwarding in escape command-line's -R processing. bz#3499 MFC after: 1 week Sponsored by: The FreeBSD Foundation
90 lines
2.3 KiB
C
90 lines
2.3 KiB
C
/* $OpenBSD: arc4random_linux.h,v 1.12 2019/07/11 10:37:28 inoguchi Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 1996, David Mazieres <dm@uun.org>
|
|
* Copyright (c) 2008, Damien Miller <djm@openbsd.org>
|
|
* Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
|
|
* Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
/*
|
|
* Stub functions for portability. From LibreSSL with some adaptations.
|
|
*/
|
|
|
|
#include <sys/mman.h>
|
|
|
|
#include <signal.h>
|
|
|
|
/* OpenSSH isn't multithreaded */
|
|
#define _ARC4_LOCK()
|
|
#define _ARC4_UNLOCK()
|
|
#define _ARC4_ATFORK(f)
|
|
|
|
static inline void
|
|
_getentropy_fail(void)
|
|
{
|
|
fatal("getentropy failed");
|
|
}
|
|
|
|
static volatile sig_atomic_t _rs_forked;
|
|
|
|
static inline void
|
|
_rs_forkhandler(void)
|
|
{
|
|
_rs_forked = 1;
|
|
}
|
|
|
|
static inline void
|
|
_rs_forkdetect(void)
|
|
{
|
|
static pid_t _rs_pid = 0;
|
|
pid_t pid = getpid();
|
|
|
|
if (_rs_pid == 0 || _rs_pid == 1 || _rs_pid != pid || _rs_forked) {
|
|
_rs_pid = pid;
|
|
_rs_forked = 0;
|
|
if (rs)
|
|
memset(rs, 0, sizeof(*rs));
|
|
}
|
|
}
|
|
|
|
static inline int
|
|
_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
|
|
{
|
|
#if defined(MAP_ANON) && defined(MAP_PRIVATE)
|
|
if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
|
|
MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
|
|
return (-1);
|
|
|
|
if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
|
|
MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
|
|
munmap(*rsp, sizeof(**rsp));
|
|
*rsp = NULL;
|
|
return (-1);
|
|
}
|
|
#else
|
|
if ((*rsp = calloc(1, sizeof(**rsp))) == NULL)
|
|
return (-1);
|
|
if ((*rsxp = calloc(1, sizeof(**rsxp))) == NULL) {
|
|
free(*rsp);
|
|
*rsp = NULL;
|
|
return (-1);
|
|
}
|
|
#endif
|
|
|
|
_ARC4_ATFORK(_rs_forkhandler);
|
|
return (0);
|
|
}
|