[openssh-commits] [openssh] 01/01: fix possible NULL deref when built without FIDO

git+noreply at mindrot.org git+noreply at mindrot.org
Fri Jun 24 14:18:45 AEST 2022


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

djm pushed a commit to branch master
in repository openssh.

commit 7d25b37fb2a5ff4dadabcbdac6087a97479434f5
Author: Damien Miller <djm at mindrot.org>
Date:   Fri Jun 24 13:46:39 2022 +1000

    fix possible NULL deref when built without FIDO
    
    Analysis/fix from kircher in bz3443; ok dtucker@
---
 ssh-sk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ssh-sk.c b/ssh-sk.c
index a1ff5cc4..ba514607 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());

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


More information about the openssh-commits mailing list