]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
fix possible NULL deref when built without FIDO
authorDamien Miller <djm@mindrot.org>
Fri, 24 Jun 2022 03:46:39 +0000 (13:46 +1000)
committerDamien Miller <djm@mindrot.org>
Fri, 24 Jun 2022 03:46:39 +0000 (13:46 +1000)
Analysis/fix from kircher in bz3443; ok dtucker@

ssh-sk.c

index a1ff5cc485e8a788caf97b590b17760794455de7..ba51460791b329ff66ad77290bff36ce73de4d9d 100644 (file)
--- 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());