upstream commit

Zero a stack buffer with explicit_bzero() instead of
 memset() when returning from client_loop() for consistency with
 buffer_free()/sshbuf_free().

ok dtucker@ deraadt@ djm@

Upstream-ID: bc9975b2095339811c3b954694d7d15ea5c58f66
This commit is contained in:
jsg@openbsd.org 2016-01-23 05:31:35 +00:00 committed by Damien Miller
parent 65a3c0dacb
commit 458abc2934
1 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.280 2016/01/14 16:17:39 markus Exp $ */ /* $OpenBSD: clientloop.c,v 1.281 2016/01/23 05:31:35 jsg 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
@ -1787,7 +1787,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
} }
/* Clear and free any buffers. */ /* Clear and free any buffers. */
memset(buf, 0, sizeof(buf)); explicit_bzero(buf, sizeof(buf));
buffer_free(&stdin_buffer); buffer_free(&stdin_buffer);
buffer_free(&stdout_buffer); buffer_free(&stdout_buffer);
buffer_free(&stderr_buffer); buffer_free(&stderr_buffer);