From: Damien Miller <djm@mindrot.org>
Date: Fri, 24 Jun 2022 03:46:39 +0000 (+1000)
Subject: fix possible NULL deref when built without FIDO
X-Git-Tag: V_9_1_P1~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d25b37fb2a5ff4dadabcbdac6087a97479434f5;p=thirdparty%2Fopenssh-portable.git

fix possible NULL deref when built without FIDO

Analysis/fix from kircher in bz3443; ok dtucker@
---

diff --git a/ssh-sk.c b/ssh-sk.c
index a1ff5cc48..ba5146079 100644
--- a/ssh-sk.c
+++ b/ssh-sk.c
@@ -127,10 +127,11 @@ sshsk_open(const char *path)
 		ret->sk_enroll = ssh_sk_enroll;
 		ret->sk_sign = ssh_sk_sign;
 		ret->sk_load_resident_keys = ssh_sk_load_resident_keys;
+		return ret;
 #else
 		error("internal security key support not enabled");
+		goto fail;
 #endif
-		return ret;
 	}
 	if ((ret->dlhandle = dlopen(path, RTLD_NOW)) == NULL) {
 		error("Provider \"%s\" dlopen failed: %s", path, dlerror());