upstream commit

memleak of algorithm name in mm_answer_sign; reported by
 Jakub Jelen

Upstream-ID: ccd742cd25952240ebd23d7d4d6b605862584d08
This commit is contained in:
djm@openbsd.org 2016-02-15 23:32:37 +00:00 committed by Damien Miller
parent ffb1e7e896
commit 24c9bded56
1 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor.c,v 1.156 2016/01/14 16:17:39 markus Exp $ */ /* $OpenBSD: monitor.c,v 1.157 2016/02/15 23:32:37 djm Exp $ */
/* /*
* Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -684,10 +684,9 @@ mm_answer_sign(int sock, Buffer *m)
struct ssh *ssh = active_state; /* XXX */ struct ssh *ssh = active_state; /* XXX */
extern int auth_sock; /* XXX move to state struct? */ extern int auth_sock; /* XXX move to state struct? */
struct sshkey *key; struct sshkey *key;
struct sshbuf *sigbuf; struct sshbuf *sigbuf = NULL;
u_char *p; u_char *p = NULL, *signature = NULL;
u_char *signature; char *alg = NULL;
char *alg;
size_t datlen, siglen, alglen; size_t datlen, siglen, alglen;
int r, keyid, is_proof = 0; int r, keyid, is_proof = 0;
const char proof_req[] = "hostkeys-prove-00@openssh.com"; const char proof_req[] = "hostkeys-prove-00@openssh.com";
@ -764,6 +763,7 @@ mm_answer_sign(int sock, Buffer *m)
if ((r = sshbuf_put_string(m, signature, siglen)) != 0) if ((r = sshbuf_put_string(m, signature, siglen)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r)); fatal("%s: buffer error: %s", __func__, ssh_err(r));
free(alg);
free(p); free(p);
free(signature); free(signature);