[openssh-commits] [openssh] 02/08: upstream: avoid possible NULL deref; from Swival scanner

[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 8dec7df34b38ea510b5548a020f2664e59700d23
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Sun Jun 28 23:31:28 2026 +0000

    upstream: avoid possible NULL deref; from Swival scanner
    
    OpenBSD-Commit-ID: 62ea8e12b7cddee933596e72f8ab0f7364147c0f
---
 sshconnect2.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sshconnect2.c b/sshconnect2.c
index 5a48c73ed..ecb4ae524 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.386 2026/05/13 05:11:02 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.387 2026/06/28 23:31:28 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1441,7 +1441,8 @@ sign_and_send_pubkey(struct ssh *ssh, Identity *id)
 		    !fallback_sigtype) {
 			if (sign_id->agent_fd != -1)
 				loc = "agent ";
-			else if ((sign_id->key->flags & SSHKEY_FLAG_EXT) != 0)
+			else if (sign_id->key != NULL &&
+			    (sign_id->key->flags & SSHKEY_FLAG_EXT) != 0)
 				loc = "token ";
 			logit("%skey %s %s returned incorrect signature type",
 			    loc, sshkey_type(id->key), fp);

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