diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-05-18 04:29:35 +0000 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2020-08-20 16:53:22 -0700 |
| commit | 20ebb46da5b45e2a11ffc76d768a2bfbdb33e78c (patch) | |
| tree | 07703fb181d45a0510e67f93adc0be708f8b2f8f | |
| parent | c4490d08a259437ddd2625bd6cc0200aa9342bb8 (diff) | |
UPSTREAM: upstream: avoid possible NULL deref; from Pedro Martelletto
OpenBSD-Commit-ID: e6099c3fbb70aa67eb106e84d8b43f1fa919b721
(cherry picked from commit 2a63ce5cd6d0e782783bf721462239b03757dd49)
Bug: 162492243
Change-Id: I28cdc9a0d71ec62d7d0718f081facb706656dec1
| -rw-r--r-- | ssh-keygen.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 8c23a54c..2c5c75db 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.409 2020/05/02 07:19:43 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.409.2.1 2020/05/18 19:02:13 benno Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2950,14 +2950,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 && |