CVS commit: src/crypto/external/bsd/openssh/dist

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Mon Apr 13 18:00:48 UTC 2015

Modified Files:
        src/crypto/external/bsd/openssh/dist: serverloop.c

Log Message:
CID 1293655: Forward NULL deref


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/serverloop.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/crypto/external/bsd/openssh/dist/serverloop.c
diff -u src/crypto/external/bsd/openssh/dist/serverloop.c:1.11 src/crypto/external/bsd/openssh/dist/serverloop.c:1.12
--- src/crypto/external/bsd/openssh/dist/serverloop.c:1.11	Mon Apr 13 13:50:31 2015
+++ src/crypto/external/bsd/openssh/dist/serverloop.c	Mon Apr 13 14:00:47 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: serverloop.c,v 1.11 2015/04/13 17:50:31 christos Exp $	*/
+/*	$NetBSD: serverloop.c,v 1.12 2015/04/13 18:00:47 christos Exp $	*/
 /* $OpenBSD: serverloop.c,v 1.178 2015/02/20 22:17:21 djm Exp $ */
 /*
  * Author: Tatu Ylonen <y...@cs.hut.fi>
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: serverloop.c,v 1.11 2015/04/13 17:50:31 christos Exp $");
+__RCSID("$NetBSD: serverloop.c,v 1.12 2015/04/13 18:00:47 christos Exp $");
 #include <sys/param.h>	/* MIN MAX */
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -863,8 +863,9 @@ server_loop2(Authctxt *authctxt)
 			if (packet_need_rekeying()) {
 				int r;
 				debug("need rekeying");
-				active_state->kex->done = 0;
-				 if ((r = kex_send_kexinit(active_state)) != 0)
+				if (active_state->kex)
+					active_state->kex->done = 0;
+				if ((r = kex_send_kexinit(active_state)) != 0)
 					logit("%s: kex_send_kexinit: %s",
 					    __func__, ssh_err(r));
 			}