Module Name: src
Committed By: riz
Date: Wed Nov 4 16:25:17 UTC 2015
Modified Files:
src/sys/dev [netbsd-7]: cgd.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.90.2.1 src/sys/dev/cgd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.90 src/sys/dev/cgd.c:1.90.2.1
--- src/sys/dev/cgd.c:1.90 Fri Jul 25 08:10:35 2014
+++ src/sys/dev/cgd.c Wed Nov 4 16:25:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.90 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: cgd.c,v 1.90.2.1 2015/11/04 16:25:17 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.2.1 2015/11/04 16:25:17 riz Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -706,7 +706,7 @@ cgd_ioctl_set(struct cgd_softc *cs, void
* 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;
