[src/netbsd-7]: src/sys/arch Pull up following revision(s) (requested by tsut...

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

details:   https://anonhg.NetBSD.org/src/rev/222bc3350cb3
branches:  netbsd-7
changeset: 798295:222bc3350cb3
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 24 09:55:32 2014 +0000

description:
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().

diffstat:

 sys/arch/sparc/dev/fd.c    |  6 +++---
 sys/arch/sparc64/dev/fdc.c |  6 +++---
 sys/arch/sun3/dev/fd.c     |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r e8e73cb17d3a -r 222bc3350cb3 sys/arch/sparc/dev/fd.c
--- a/sys/arch/sparc/dev/fd.c   Sun Aug 24 09:38:36 2014 +0000
+++ b/sys/arch/sparc/dev/fd.c   Sun Aug 24 09:55:32 2014 +0000
@@ -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 @@
        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);
diff -r e8e73cb17d3a -r 222bc3350cb3 sys/arch/sparc64/dev/fdc.c
--- a/sys/arch/sparc64/dev/fdc.c        Sun Aug 24 09:38:36 2014 +0000
+++ b/sys/arch/sparc64/dev/fdc.c        Sun Aug 24 09:55:32 2014 +0000
@@ -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 @@
        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);
diff -r e8e73cb17d3a -r 222bc3350cb3 sys/arch/sun3/dev/fd.c
--- a/sys/arch/sun3/dev/fd.c    Sun Aug 24 09:38:36 2014 +0000
+++ b/sys/arch/sun3/dev/fd.c    Sun Aug 24 09:55:32 2014 +0000
@@ -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 @@
        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;