tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
Remove NULL-checks before sshbuf_free().

ok djm@

Upstream-ID: 5ebed00ed5f9f03b119a345085e8774565466917
This commit is contained in:
mmcc@openbsd.org 2015-12-11 04:21:11 +00:00 committed by Damien Miller
parent a4b9e0f4e4
commit 52d7078421
8 changed files with 37 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
authfile.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfile.c,v 1.119 2015/12/11 02:31:47 mmcc Exp $ */ /* $OpenBSD: authfile.c,v 1.120 2015/12/11 04:21:11 mmcc Exp $ */
/* /*
* Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved.
* *
@ -243,8 +243,7 @@ sshkey_load_private_type_fd(int fd, int type, const char *passphrase,
/* success */ /* success */
r = 0; r = 0;
out: out:
if (buffer != NULL) sshbuf_free(buffer);
sshbuf_free(buffer);
return r; return r;
} }
@ -278,8 +277,7 @@ sshkey_load_private(const char *filename, const char *passphrase,
r = 0; r = 0;
out: out:
close(fd); close(fd);
if (buffer != NULL) sshbuf_free(buffer);
sshbuf_free(buffer);
return r; return r;
} }

14
krl.c
View File

@ -14,7 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $OpenBSD: krl.c,v 1.35 2015/12/04 16:41:28 markus Exp $ */ /* $OpenBSD: krl.c,v 1.36 2015/12/11 04:21:12 mmcc Exp $ */
#include "includes.h" #include "includes.h"
@ -826,10 +826,8 @@ parse_revoked_certs(struct sshbuf *buf, struct ssh_krl *krl)
goto out; goto out;
while (sshbuf_len(buf) > 0) { while (sshbuf_len(buf) > 0) {
if (subsect != NULL) { sshbuf_free(subsect);
sshbuf_free(subsect); subsect = NULL;
subsect = NULL;
}
if ((r = sshbuf_get_u8(buf, &type)) != 0 || if ((r = sshbuf_get_u8(buf, &type)) != 0 ||
(r = sshbuf_froms(buf, &subsect)) != 0) (r = sshbuf_froms(buf, &subsect)) != 0)
goto out; goto out;
@ -1059,10 +1057,8 @@ ssh_krl_from_blob(struct sshbuf *buf, struct ssh_krl **krlp,
if ((r = sshbuf_consume(copy, sects_off)) != 0) if ((r = sshbuf_consume(copy, sects_off)) != 0)
goto out; goto out;
while (sshbuf_len(copy) > 0) { while (sshbuf_len(copy) > 0) {
if (sect != NULL) { sshbuf_free(sect);
sshbuf_free(sect); sect = NULL;
sect = NULL;
}
if ((r = sshbuf_get_u8(copy, &type)) != 0 || if ((r = sshbuf_get_u8(copy, &type)) != 0 ||
(r = sshbuf_froms(copy, &sect)) != 0) (r = sshbuf_froms(copy, &sect)) != 0)
goto out; goto out;

14
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.220 2015/12/11 03:24:25 djm Exp $ */ /* $OpenBSD: packet.c,v 1.221 2015/12/11 04:21:12 mmcc Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2453,8 +2453,7 @@ newkeys_to_blob(struct sshbuf *m, struct ssh *ssh, int mode)
goto out; goto out;
r = sshbuf_put_stringb(m, b); r = sshbuf_put_stringb(m, b);
out: out:
if (b != NULL) sshbuf_free(b);
sshbuf_free(b);
return r; return r;
} }
@ -2590,8 +2589,7 @@ newkeys_from_blob(struct sshbuf *m, struct ssh *ssh, int mode)
r = 0; r = 0;
out: out:
free(newkey); free(newkey);
if (b != NULL) sshbuf_free(b);
sshbuf_free(b);
return r; return r;
} }
@ -2624,10 +2622,8 @@ kex_from_blob(struct sshbuf *m, struct kex **kexp)
out: out:
if (r != 0 || kexp == NULL) { if (r != 0 || kexp == NULL) {
if (kex != NULL) { if (kex != NULL) {
if (kex->my != NULL) sshbuf_free(kex->my);
sshbuf_free(kex->my); sshbuf_free(kex->peer);
if (kex->peer != NULL)
sshbuf_free(kex->peer);
free(kex); free(kex);
} }
if (kexp != NULL) if (kexp != NULL)

8
ssh-dss.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-dss.c,v 1.33 2015/12/10 17:08:40 mmcc Exp $ */ /* $OpenBSD: ssh-dss.c,v 1.34 2015/12/11 04:21:12 mmcc Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -122,8 +122,7 @@ ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
explicit_bzero(digest, sizeof(digest)); explicit_bzero(digest, sizeof(digest));
if (sig != NULL) if (sig != NULL)
DSA_SIG_free(sig); DSA_SIG_free(sig);
if (b != NULL) sshbuf_free(b);
sshbuf_free(b);
return ret; return ret;
} }
@ -209,8 +208,7 @@ ssh_dss_verify(const struct sshkey *key,
explicit_bzero(digest, sizeof(digest)); explicit_bzero(digest, sizeof(digest));
if (sig != NULL) if (sig != NULL)
DSA_SIG_free(sig); DSA_SIG_free(sig);
if (b != NULL) sshbuf_free(b);
sshbuf_free(b);
free(ktype); free(ktype);
if (sigblob != NULL) { if (sigblob != NULL) {
explicit_bzero(sigblob, len); explicit_bzero(sigblob, len);

14
ssh-ecdsa.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-ecdsa.c,v 1.11 2014/06/24 01:13:21 djm Exp $ */ /* $OpenBSD: ssh-ecdsa.c,v 1.12 2015/12/11 04:21:12 mmcc Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2010 Damien Miller. All rights reserved. * Copyright (c) 2010 Damien Miller. All rights reserved.
@ -99,10 +99,8 @@ ssh_ecdsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
ret = 0; ret = 0;
out: out:
explicit_bzero(digest, sizeof(digest)); explicit_bzero(digest, sizeof(digest));
if (b != NULL) sshbuf_free(b);
sshbuf_free(b); sshbuf_free(bb);
if (bb != NULL)
sshbuf_free(bb);
if (sig != NULL) if (sig != NULL)
ECDSA_SIG_free(sig); ECDSA_SIG_free(sig);
return ret; return ret;
@ -179,10 +177,8 @@ ssh_ecdsa_verify(const struct sshkey *key,
out: out:
explicit_bzero(digest, sizeof(digest)); explicit_bzero(digest, sizeof(digest));
if (sigbuf != NULL) sshbuf_free(sigbuf);
sshbuf_free(sigbuf); sshbuf_free(b);
if (b != NULL)
sshbuf_free(b);
if (sig != NULL) if (sig != NULL)
ECDSA_SIG_free(sig); ECDSA_SIG_free(sig);
free(ktype); free(ktype);

8
ssh-rsa.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-rsa.c,v 1.57 2015/12/10 17:08:40 mmcc Exp $ */ /* $OpenBSD: ssh-rsa.c,v 1.58 2015/12/11 04:21:12 mmcc Exp $ */
/* /*
* Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org> * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
* *
@ -156,8 +156,7 @@ ssh_rsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
explicit_bzero(sig, slen); explicit_bzero(sig, slen);
free(sig); free(sig);
} }
if (b != NULL) sshbuf_free(b);
sshbuf_free(b);
return ret; return ret;
} }
@ -227,8 +226,7 @@ ssh_rsa_verify(const struct sshkey *key,
free(sigblob); free(sigblob);
} }
free(ktype); free(ktype);
if (b != NULL) sshbuf_free(b);
sshbuf_free(b);
explicit_bzero(digest, sizeof(digest)); explicit_bzero(digest, sizeof(digest));
return ret; return ret;
} }

8
sshbuf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshbuf.c,v 1.4 2015/10/05 17:11:21 djm Exp $ */ /* $OpenBSD: sshbuf.c,v 1.5 2015/12/11 04:21:12 mmcc Exp $ */
/* /*
* Copyright (c) 2011 Damien Miller * Copyright (c) 2011 Damien Miller
* *
@ -163,10 +163,8 @@ sshbuf_free(struct sshbuf *buf)
* If we are a child, the free our parent to decrement its reference * If we are a child, the free our parent to decrement its reference
* count and possibly free it. * count and possibly free it.
*/ */
if (buf->parent != NULL) { sshbuf_free(buf->parent);
sshbuf_free(buf->parent); buf->parent = NULL;
buf->parent = NULL;
}
/* /*
* If we are a parent with still-extant children, then don't free just * If we are a parent with still-extant children, then don't free just
* yet. The last child's call to sshbuf_free should decrement our * yet. The last child's call to sshbuf_free should decrement our

29
sshkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshkey.c,v 1.30 2015/12/11 02:31:47 mmcc Exp $ */ /* $OpenBSD: sshkey.c,v 1.31 2015/12/11 04:21:12 mmcc Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@ -420,12 +420,9 @@ cert_free(struct sshkey_cert *cert)
if (cert == NULL) if (cert == NULL)
return; return;
if (cert->certblob != NULL) sshbuf_free(cert->certblob);
sshbuf_free(cert->certblob); sshbuf_free(cert->critical);
if (cert->critical != NULL) sshbuf_free(cert->extensions);
sshbuf_free(cert->critical);
if (cert->extensions != NULL)
sshbuf_free(cert->extensions);
free(cert->key_id); free(cert->key_id);
for (i = 0; i < cert->nprincipals; i++) for (i = 0; i < cert->nprincipals; i++)
free(cert->principals[i]); free(cert->principals[i]);
@ -2472,8 +2469,7 @@ sshkey_certify(struct sshkey *k, struct sshkey *ca)
sshbuf_reset(cert); sshbuf_reset(cert);
free(sig_blob); free(sig_blob);
free(ca_blob); free(ca_blob);
if (principals != NULL) sshbuf_free(principals);
sshbuf_free(principals);
return ret; return ret;
} }
@ -3487,10 +3483,8 @@ sshkey_private_rsa1_to_blob(struct sshkey *key, struct sshbuf *blob,
out: out:
explicit_bzero(&ciphercontext, sizeof(ciphercontext)); explicit_bzero(&ciphercontext, sizeof(ciphercontext));
explicit_bzero(buf, sizeof(buf)); explicit_bzero(buf, sizeof(buf));
if (buffer != NULL) sshbuf_free(buffer);
sshbuf_free(buffer); sshbuf_free(encrypted);
if (encrypted != NULL)
sshbuf_free(encrypted);
return r; return r;
} }
@ -3644,8 +3638,7 @@ sshkey_parse_public_rsa1_fileblob(struct sshbuf *blob,
pub = NULL; pub = NULL;
out: out:
if (copy != NULL) sshbuf_free(copy);
sshbuf_free(copy);
sshkey_free(pub); sshkey_free(pub);
return r; return r;
} }
@ -3760,10 +3753,8 @@ sshkey_parse_private_rsa1(struct sshbuf *blob, const char *passphrase,
explicit_bzero(&ciphercontext, sizeof(ciphercontext)); explicit_bzero(&ciphercontext, sizeof(ciphercontext));
free(comment); free(comment);
sshkey_free(prv); sshkey_free(prv);
if (copy != NULL) sshbuf_free(copy);
sshbuf_free(copy); sshbuf_free(decrypted);
if (decrypted != NULL)
sshbuf_free(decrypted);
return r; return r;
} }
#endif /* WITH_SSH1 */ #endif /* WITH_SSH1 */