[openssh-commits] [openssh] 14/22: upstream: fix possible null-deref in check_key_not_revoked; ok

[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 fbff605e637b068061ab6784ff03e3874890c092
Author: markus at openbsd.org <markus at openbsd.org>
Date:   Fri Mar 6 18:25:12 2020 +0000

    upstream: fix possible null-deref in check_key_not_revoked; ok
    
    djm
    
    OpenBSD-Commit-ID: 80855e9d7af42bb6fcc16c074ba69876bfe5e3bf
---
 hostfile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hostfile.c b/hostfile.c
index 7af47adf..a4a35597 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.78 2020/02/26 13:40:09 jsg Exp $ */
+/* $OpenBSD: hostfile.c,v 1.79 2020/03/06 18:25:12 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -312,7 +312,7 @@ check_key_not_revoked(struct hostkeys *hostkeys, struct sshkey *k)
 			continue;
 		if (sshkey_equal_public(k, hostkeys->entries[i].key))
 			return -1;
-		if (is_cert &&
+		if (is_cert && k != NULL &&
 		    sshkey_equal_public(k->cert->signature_key,
 		    hostkeys->entries[i].key))
 			return -1;

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