summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keygen.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2020-03-06 18:29:14 +0000
committermarkus <markus@openbsd.org>2020-03-06 18:29:14 +0000
commit69c0de3bebde8bf49d34d22e5d2129a4a98af1f8 (patch)
tree4e5d0f123f3c5e46d90c415a7da50000e779e87b /usr.bin/ssh/ssh-keygen.c
parentdo not leak oprincipals; ok djm (diff)
downloadwireguard-openbsd-69c0de3bebde8bf49d34d22e5d2129a4a98af1f8.tar.xz
wireguard-openbsd-69c0de3bebde8bf49d34d22e5d2129a4a98af1f8.zip
fix use-after-free in do_download_sk; ok djm
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
-rw-r--r--usr.bin/ssh/ssh-keygen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 46a2d5f5d1e..1807abee1a3 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.401 2020/03/06 18:15:04 markus Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.402 2020/03/06 18:29:14 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3003,9 +3003,9 @@ do_download_sk(const char *skprovider, const char *device)
free(path);
if ((r = sshkey_save_public(keys[i], pubpath,
keys[i]->sk_application)) != 0) {
- free(pubpath);
error("Saving public key \"%s\" failed: %s",
pubpath, ssh_err(r));
+ free(pubpath);
break;
}
free(pubpath);