[src/netbsd-7-0]: src/sys/dev Pull up following revision(s) (requested by ria...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/95fb42d95bb2
branches:  netbsd-7-0
changeset: 801055:95fb42d95bb2
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Nov 04 16:24:38 2015 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #899):
        sys/dev/cgd.c: revision 1.97
Use explicit_memset to zero key material.

diffstat:

 sys/dev/cgd.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 178f6e303ecc -r 95fb42d95bb2 sys/dev/cgd.c
--- a/sys/dev/cgd.c     Thu Oct 15 20:35:28 2015 +0000
+++ b/sys/dev/cgd.c     Wed Nov 04 16:24:38 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.90 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: cgd.c,v 1.90.4.1 2015/11/04 16:24:38 riz Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.90 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.90.4.1 2015/11/04 16:24:38 riz Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -706,7 +706,7 @@
         * and encblkno8.
         */
        cs->sc_cdata.cf_blocksize /= encblkno[i].d;
-       (void)memset(inbuf, 0, MAX_KEYSIZE);
+       (void)explicit_memset(inbuf, 0, MAX_KEYSIZE);
        if (!cs->sc_cdata.cf_priv) {
                ret = EINVAL;           /* XXX is this the right error? */
                goto bail;