[openssh-commits] [openssh] 01/02: upstream: fix NULL deference (bzero) on err

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit b2e3e57be4a933d9464bccbe592573725765486f
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Jun 27 06:29:35 2019 +0000

    upstream: fix NULL deference (bzero) on err
    
    =?UTF-8?q?or=20path=20added=20in=20last=20commit;=20spotted=20by=20Reynir?=
    =?UTF-8?q?=20Bj=C3=B6rnsson?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ok deraadt@ markus@ tb@
    
    OpenBSD-Commit-ID: b11b084bcc551b2c630560eb08618dd501027bbd
---
 sshkey.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sshkey.c b/sshkey.c
index a545b42c..5d28c457 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.77 2019/06/23 12:21:46 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.78 2019/06/27 06:29:35 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -1985,9 +1985,9 @@ sshkey_shield_private(struct sshkey *k)
  out:
 	/* XXX behaviour on error - invalidate original private key? */
 	cipher_free(cctx);
-	explicit_bzero(enc, enclen);
 	explicit_bzero(keyiv, sizeof(keyiv));
 	explicit_bzero(&tmp, sizeof(tmp));
+	freezero(enc, enclen);
 	freezero(prekey, SSHKEY_SHIELD_PREKEY_LEN);
 	sshkey_free(kswap);
 	sshbuf_free(prvbuf);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.