tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2013/06/20 19:15:06 

[krl.c]
     don't leak the rdata blob on errors; ok djm@
This commit is contained in:
Damien Miller 2013-07-18 16:09:44 +10:00
parent 044bd2a7dd
commit 3071070b39
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -9,6 +9,9 @@
parsing them from remote servers. parsing them from remote servers.
Improve error checking in parsing of 'T' lines. Improve error checking in parsing of 'T' lines.
ok dtucker@ deraadt@ ok dtucker@ deraadt@
- markus@cvs.openbsd.org 2013/06/20 19:15:06
[krl.c]
don't leak the rdata blob on errors; ok djm@
20130702 20130702
- (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config

19
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.11 2013/04/05 00:14:00 djm Exp $ */ /* $OpenBSD: krl.c,v 1.12 2013/06/20 19:15:06 markus Exp $ */
#include "includes.h" #include "includes.h"
@ -887,9 +887,10 @@ ssh_krl_from_blob(Buffer *buf, struct ssh_krl **krlp,
char timestamp[64]; char timestamp[64];
int ret = -1, r, sig_seen; int ret = -1, r, sig_seen;
Key *key = NULL, **ca_used = NULL; Key *key = NULL, **ca_used = NULL;
u_char type, *blob; u_char type, *blob, *rdata = NULL;
u_int i, j, sig_off, sects_off, blen, format_version, nca_used = 0; u_int i, j, sig_off, sects_off, rlen, blen, format_version, nca_used;
nca_used = 0;
*krlp = NULL; *krlp = NULL;
if (buffer_len(buf) < sizeof(KRL_MAGIC) - 1 || if (buffer_len(buf) < sizeof(KRL_MAGIC) - 1 ||
memcmp(buffer_ptr(buf), KRL_MAGIC, sizeof(KRL_MAGIC) - 1) != 0) { memcmp(buffer_ptr(buf), KRL_MAGIC, sizeof(KRL_MAGIC) - 1) != 0) {
@ -1015,21 +1016,22 @@ ssh_krl_from_blob(Buffer *buf, struct ssh_krl **krlp,
case KRL_SECTION_EXPLICIT_KEY: case KRL_SECTION_EXPLICIT_KEY:
case KRL_SECTION_FINGERPRINT_SHA1: case KRL_SECTION_FINGERPRINT_SHA1:
while (buffer_len(&sect) > 0) { while (buffer_len(&sect) > 0) {
if ((blob = buffer_get_string_ret(&sect, if ((rdata = buffer_get_string_ret(&sect,
&blen)) == NULL) { &rlen)) == NULL) {
error("%s: buffer error", __func__); error("%s: buffer error", __func__);
goto out; goto out;
} }
if (type == KRL_SECTION_FINGERPRINT_SHA1 && if (type == KRL_SECTION_FINGERPRINT_SHA1 &&
blen != 20) { rlen != 20) {
error("%s: bad SHA1 length", __func__); error("%s: bad SHA1 length", __func__);
goto out; goto out;
} }
if (revoke_blob( if (revoke_blob(
type == KRL_SECTION_EXPLICIT_KEY ? type == KRL_SECTION_EXPLICIT_KEY ?
&krl->revoked_keys : &krl->revoked_sha1s, &krl->revoked_keys : &krl->revoked_sha1s,
blob, blen) != 0) rdata, rlen) != 0)
goto out; /* revoke_blob frees blob */ goto out;
rdata = NULL; /* revoke_blob frees blob */
} }
break; break;
case KRL_SECTION_SIGNATURE: case KRL_SECTION_SIGNATURE:
@ -1095,6 +1097,7 @@ ssh_krl_from_blob(Buffer *buf, struct ssh_krl **krlp,
key_free(ca_used[i]); key_free(ca_used[i]);
} }
free(ca_used); free(ca_used);
free(rdata);
if (key != NULL) if (key != NULL)
key_free(key); key_free(key);
buffer_free(&copy); buffer_free(&copy);