diff options
| author |   djm <djm@openbsd.org> | 2020-05-18 04:29:35 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-05-18 04:29:35 +0000 |
| commit | 66266c8f2aad59963e647ebcf2c3cd97a5007264 (patch) | |
| tree | 92c610a2a1e33a660714a20a7255b2aebe3b6894 /usr.bin/ssh/ssh-keygen.c | |
| parent | Add enough stubs to allow "option DDB" to build. (diff) | |
| download | wireguard-openbsd-66266c8f2aad59963e647ebcf2c3cd97a5007264.tar.xz wireguard-openbsd-66266c8f2aad59963e647ebcf2c3cd97a5007264.zip | |
avoid possible NULL deref; from Pedro Martelletto
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 53e32bab905..5668a4fd35c 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.410 2020/05/13 09:55:57 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.411 2020/05/18 04:29:35 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2932,14 +2932,16 @@ do_download_sk(const char *skprovider, const char *device) &keys, &nkeys)) != 0) { if (i == 0 && r == SSH_ERR_KEY_WRONG_PASSPHRASE) continue; - freezero(pin, strlen(pin)); + if (pin != NULL) + freezero(pin, strlen(pin)); error("Unable to load resident keys: %s", ssh_err(r)); return -1; } } if (nkeys == 0) logit("No keys to download"); - freezero(pin, strlen(pin)); + if (pin != NULL) + freezero(pin, strlen(pin)); for (i = 0; i < nkeys; i++) { if (keys[i]->type != KEY_ECDSA_SK && |