CVS commit: src/sys/dev/scsipi

[Joerg Sonnenberger]

Module Name:    src
Committed By:   joerg
Date:           Fri Nov 25 12:39:56 UTC 2011

Modified Files:
        src/sys/dev/scsipi: cd.c sd.c

Log Message:
Replace memset with incorrect size argument with M_ZERO.


To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.294 -r1.295 src/sys/dev/scsipi/sd.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/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.303 src/sys/dev/scsipi/cd.c:1.304
--- src/sys/dev/scsipi/cd.c:1.303	Fri May 20 09:23:37 2011
+++ src/sys/dev/scsipi/cd.c	Fri Nov 25 12:39:55 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd.c,v 1.303 2011/05/20 09:23:37 reinoud Exp $	*/
+/*	$NetBSD: cd.c,v 1.304 2011/11/25 12:39:55 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.303 2011/05/20 09:23:37 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.304 2011/11/25 12:39:55 joerg Exp $");
 
 #include "rnd.h"
 
@@ -1354,10 +1354,10 @@ cdioctl(dev_t dev, u_long cmd, void *add
 
 #ifdef __HAVE_OLD_DISKLABEL
 		if (cmd == ODIOCSDINFO || cmd == ODIOCWDINFO) {
-			newlabel = malloc(sizeof (*newlabel), M_TEMP, M_WAITOK);
+			newlabel = malloc(sizeof (*newlabel), M_TEMP,
+			    M_WAITOK | M_ZERO);
 			if (newlabel == NULL)
 				return (EIO);
-			memset(newlabel, 0, sizeof newlabel);
 			memcpy(newlabel, addr, sizeof (struct olddisklabel));
 			lp = newlabel;
 		} else

Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.294 src/sys/dev/scsipi/sd.c:1.295
--- src/sys/dev/scsipi/sd.c:1.294	Sat Jul 30 12:08:37 2011
+++ src/sys/dev/scsipi/sd.c	Fri Nov 25 12:39:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: sd.c,v 1.294 2011/07/30 12:08:37 jmcneill Exp $	*/
+/*	$NetBSD: sd.c,v 1.295 2011/11/25 12:39:56 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.294 2011/07/30 12:08:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.295 2011/11/25 12:39:56 joerg Exp $");
 
 #include "opt_scsi.h"
 #include "rnd.h"
@@ -1074,10 +1074,10 @@ sdioctl(dev_t dev, u_long cmd, void *add
 
 #ifdef __HAVE_OLD_DISKLABEL
  		if (cmd == ODIOCSDINFO || cmd == ODIOCWDINFO) {
-			newlabel = malloc(sizeof *newlabel, M_TEMP, M_WAITOK);
+			newlabel = malloc(sizeof *newlabel, M_TEMP,
+			    M_WAITOK | M_ZERO);
 			if (newlabel == NULL)
 				return EIO;
-			memset(newlabel, 0, sizeof newlabel);
 			memcpy(newlabel, addr, sizeof (struct olddisklabel));
 			lp = newlabel;
 		} else