Module Name: src
Committed By: martin
Date: Sun Aug 24 09:55:33 UTC 2014
Modified Files:
src/sys/arch/sparc/dev [netbsd-7]: fd.c
src/sys/arch/sparc64/dev [netbsd-7]: fdc.c
src/sys/arch/sun3/dev [netbsd-7]: fd.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #53):
sys/arch/sun3/dev/fd.c: revision 1.78
sys/arch/sparc/dev/fd.c: revision 1.155
sys/arch/sparc64/dev/fdc.c: revision 1.42
Fix panic() on opening fd(4), caused by a wrong pointer passed to memset().
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.154.2.1 src/sys/arch/sparc/dev/fd.c
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/arch/sparc64/dev/fdc.c
cvs rdiff -u -r1.77 -r1.77.2.1 src/sys/arch/sun3/dev/fd.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/arch/sparc/dev/fd.c
diff -u src/sys/arch/sparc/dev/fd.c:1.154 src/sys/arch/sparc/dev/fd.c:1.154.2.1
--- src/sys/arch/sparc/dev/fd.c:1.154 Fri Jul 25 08:10:34 2014
+++ src/sys/arch/sparc/dev/fd.c Sun Aug 24 09:55:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.154 2014/07/25 08:10:34 dholland Exp $ */
+/* $NetBSD: fd.c,v 1.154.2.1 2014/08/24 09:55:33 martin Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.154 2014/07/25 08:10:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.154.2.1 2014/08/24 09:55:33 martin Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -2244,7 +2244,7 @@ fdgetdisklabel(dev_t dev)
struct cpu_disklabel *clp = fd->sc_dk.dk_cpulabel;
memset(lp, 0, sizeof(struct disklabel));
- memset(lp, 0, sizeof(struct cpu_disklabel));
+ memset(clp, 0, sizeof(struct cpu_disklabel));
lp->d_type = DTYPE_FLOPPY;
lp->d_secsize = FD_BSIZE(fd);
Index: src/sys/arch/sparc64/dev/fdc.c
diff -u src/sys/arch/sparc64/dev/fdc.c:1.41 src/sys/arch/sparc64/dev/fdc.c:1.41.2.1
--- src/sys/arch/sparc64/dev/fdc.c:1.41 Fri Jul 25 08:10:35 2014
+++ src/sys/arch/sparc64/dev/fdc.c Sun Aug 24 09:55:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc.c,v 1.41 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: fdc.c,v 1.41.2.1 2014/08/24 09:55:33 martin Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.41 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.41.2.1 2014/08/24 09:55:33 martin Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -2430,7 +2430,7 @@ fdgetdisklabel(dev_t dev)
struct cpu_disklabel *clp = fd->sc_dk.dk_cpulabel;
memset(lp, 0, sizeof(struct disklabel));
- memset(lp, 0, sizeof(struct cpu_disklabel));
+ memset(clp, 0, sizeof(struct cpu_disklabel));
lp->d_type = DTYPE_FLOPPY;
lp->d_secsize = FD_BSIZE(fd);
Index: src/sys/arch/sun3/dev/fd.c
diff -u src/sys/arch/sun3/dev/fd.c:1.77 src/sys/arch/sun3/dev/fd.c:1.77.2.1
--- src/sys/arch/sun3/dev/fd.c:1.77 Fri Jul 25 08:10:35 2014
+++ src/sys/arch/sun3/dev/fd.c Sun Aug 24 09:55:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.77 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: fd.c,v 1.77.2.1 2014/08/24 09:55:32 martin Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.77 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.77.2.1 2014/08/24 09:55:32 martin Exp $");
#include "opt_ddb.h"
@@ -1875,7 +1875,7 @@ fdgetdisklabel(dev_t dev)
struct cpu_disklabel *clp = fd->sc_dk.dk_cpulabel;
memset(lp, 0, sizeof(struct disklabel));
- memset(lp, 0, sizeof(struct cpu_disklabel));
+ memset(clp, 0, sizeof(struct cpu_disklabel));
lp->d_type = DTYPE_FLOPPY;
lp->d_secsize = FDC_BSIZE;
