1 files changed, 7 insertions, 10 deletions

diff --git a/channels.c b/channels.c
index 226ba7a39..95a51e21b 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.395 2020/01/25 06:40:20 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.398 2020/04/25 06:59:36 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -454,7 +454,7 @@ fwd_perm_clear(struct permission *perm)
         free(perm->host_to_connect);
         free(perm->listen_host);
         free(perm->listen_path);
-        bzero(perm, sizeof(*perm));
+        memset(perm, 0, sizeof(*perm));
 }
 
 /* Returns an printable name for the specified forwarding permission list */
@@ -625,14 +625,12 @@ channel_free(struct ssh *ssh, Channel *c)
                 if (cc->abandon_cb != NULL)
                         cc->abandon_cb(ssh, c, cc->ctx);
                 TAILQ_REMOVE(&c->status_confirms, cc, entry);
-                explicit_bzero(cc, sizeof(*cc));
-                free(cc);
+                freezero(cc, sizeof(*cc));
         }
         if (c->filter_cleanup != NULL && c->filter_ctx != NULL)
                 c->filter_cleanup(ssh, c->self, c->filter_ctx);
         sc->channels[c->self] = NULL;
-        explicit_bzero(c, sizeof(*c));
-        free(c);
+        freezero(c, sizeof(*c));
 }
 
 void
@@ -3295,8 +3293,7 @@ channel_input_status_confirm(int type, u_int32_t seq, struct ssh *ssh)
                 return 0;
         cc->cb(ssh, type, c, cc->ctx);
         TAILQ_REMOVE(&c->status_confirms, cc, entry);
-        explicit_bzero(cc, sizeof(*cc));
-        free(cc);
+        freezero(cc, sizeof(*cc));
         return 0;
 }
 
@@ -4004,7 +4001,7 @@ channel_request_rforward_cancel_tcpip(struct ssh *ssh,
         struct permission_set *pset = &sc->local_perms;
         int r;
         u_int i;
-        struct permission *perm;
+        struct permission *perm = NULL;
 
         for (i = 0; i < pset->num_permitted_user; i++) {
                 perm = &pset->permitted_user[i];
@@ -4040,7 +4037,7 @@ channel_request_rforward_cancel_streamlocal(struct ssh *ssh, const char *path)
         struct permission_set *pset = &sc->local_perms;
         int r;
         u_int i;
-        struct permission *perm;
+        struct permission *perm = NULL;
 
         for (i = 0; i < pset->num_permitted_user; i++) {
                 perm = &pset->permitted_user[i];