summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2006-09-19 21:14:08 +0000
committermarkus <markus@openbsd.org>2006-09-19 21:14:08 +0000
commit3bdcaec2510ae07927f8e26df81ca8e05d46e188 (patch)
treefb3a43784154be56139e6cb28c22e5f77c229f6d
parentadd chio.conf bits. (diff)
downloadwireguard-openbsd-3bdcaec2510ae07927f8e26df81ca8e05d46e188.tar.xz
wireguard-openbsd-3bdcaec2510ae07927f8e26df81ca8e05d46e188.zip
client NULL deref on protocol error; Tavis Ormandy, Google Security Team
-rw-r--r--usr.bin/ssh/packet.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c
index 278948c8351..1f0fabd7607 100644
--- a/usr.bin/ssh/packet.c
+++ b/usr.bin/ssh/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.144 2006/09/16 19:53:37 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.145 2006/09/19 21:14:08 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -682,6 +682,9 @@ packet_enable_delayed_compress(void)
*/
after_authentication = 1;
for (mode = 0; mode < MODE_MAX; mode++) {
+ /* protocol error: USERAUTH_SUCCESS received before NEWKEYS */
+ if (newkeys[mode] == NULL)
+ continue;
comp = &newkeys[mode]->comp;
if (comp && !comp->enabled && comp->type == COMP_DELAYED) {
packet_init_compression();