diff options
author | delphij <delphij@FreeBSD.org> | 2016-11-02 07:23:19 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2016-11-02 07:23:19 +0000 |
commit | c3ce2fe853233c3441e70fa0f68d37cc0998d626 (patch) | |
tree | a6e7729247c1d8bc1866097d8a1d0f6efdc89927 | |
parent | 166093516c6aacc3b4828524e9ddc45bfbdd279c (diff) | |
download | FreeBSD-src-c3ce2fe853233c3441e70fa0f68d37cc0998d626.zip FreeBSD-src-c3ce2fe853233c3441e70fa0f68d37cc0998d626.tar.gz |
Fix Fix OpenSSH remote Denial of Service vulnerability.
Security: FreeBSD-SA-16:33.openssh
Approved by: so
-rw-r--r-- | UPDATING | 4 | ||||
-rw-r--r-- | crypto/openssh/kex.c | 1 | ||||
-rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 6 insertions, 1 deletions
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20161102 p3 FreeBSD-SA-16:33.openssh + + Fix Fix OpenSSH remote Denial of Service vulnerability. + 20161025 p2 FreeBSD-SA-16:15.sysarch [revised] FreeBSD-SA-16:32.bhyve diff --git a/crypto/openssh/kex.c b/crypto/openssh/kex.c index d371f47..9c9f562 100644 --- a/crypto/openssh/kex.c +++ b/crypto/openssh/kex.c @@ -468,6 +468,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt) if (kex == NULL) return SSH_ERR_INVALID_ARGUMENT; + ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL); ptr = sshpkt_ptr(ssh, &dlen); if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0) return r; diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index f734ad1..e5a5f3c 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="11.0" -BRANCH="RELEASE-p2" +BRANCH="RELEASE-p3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi |