diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/luna88k/luna88k/disksubr.c | 3 | ||||
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/disksubr.c | 3 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/disksubr.c | 3 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/disksubr.c | 3 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/disksubr.c | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/sys/arch/luna88k/luna88k/disksubr.c b/sys/arch/luna88k/luna88k/disksubr.c index d5d96e7f50f..9233a7d0ad7 100644 --- a/sys/arch/luna88k/luna88k/disksubr.c +++ b/sys/arch/luna88k/luna88k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.42 2009/08/13 15:23:10 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.43 2010/02/26 23:11:56 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.12 2002/02/19 17:09:44 wiz Exp $ */ /* @@ -333,6 +333,7 @@ disklabel_bsd_to_om(struct disklabel *lp, struct sun_disklabel *sl) return (EINVAL); /* Format conversion. */ + bzero(lp, sizeof(*lp)); memcpy(sl->sl_text, lp->d_packname, sizeof(lp->d_packname)); sl->sl_rpm = 0; /* UniOS */ #if 0 /* leave as was */ diff --git a/sys/arch/mvme68k/mvme68k/disksubr.c b/sys/arch/mvme68k/mvme68k/disksubr.c index 12e444a4059..7522567c5ed 100644 --- a/sys/arch/mvme68k/mvme68k/disksubr.c +++ b/sys/arch/mvme68k/mvme68k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.65 2009/08/13 15:23:10 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.66 2010/02/26 23:11:57 deraadt Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. @@ -135,6 +135,7 @@ bsdtocpulabel(struct disklabel *lp, struct mvmedisklabel *clp) char *tmot = "MOTOROLA", *id = "M68K", *mot; int i; + bzero(clp, sizeof(*clp)); clp->magic1 = lp->d_magic; clp->type = lp->d_type; clp->subtype = lp->d_subtype; diff --git a/sys/arch/mvme88k/mvme88k/disksubr.c b/sys/arch/mvme88k/mvme88k/disksubr.c index 7e2bf40999b..27883520286 100644 --- a/sys/arch/mvme88k/mvme88k/disksubr.c +++ b/sys/arch/mvme88k/mvme88k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.61 2009/08/13 15:23:10 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.62 2010/02/26 23:11:57 deraadt Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. @@ -136,6 +136,7 @@ bsdtocpulabel(struct disklabel *lp, struct mvmedisklabel *clp) char *tmot = "MOTOROLA", *id = "M88K", *mot; int i; + bzero(clp, sizeof(*clp)); clp->magic1 = lp->d_magic; clp->type = lp->d_type; clp->subtype = lp->d_subtype; diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c index 94aa419edf0..6513768187b 100644 --- a/sys/arch/sparc/sparc/disksubr.c +++ b/sys/arch/sparc/sparc/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.82 2009/08/13 15:23:11 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.83 2010/02/26 23:11:57 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */ /* @@ -406,6 +406,7 @@ disklabel_bsd_to_sun(struct disklabel *lp, struct sun_disklabel *sl) return (EINVAL); /* Format conversion. */ + bzero(sl, sizeof(*sl)); memcpy(sl->sl_text, lp->d_packname, sizeof(lp->d_packname)); sl->sl_rpm = lp->d_rpm; sl->sl_pcylinders = lp->d_ncylinders + lp->d_acylinders; /* XXX */ diff --git a/sys/arch/sparc64/sparc64/disksubr.c b/sys/arch/sparc64/sparc64/disksubr.c index 50b1d0508f0..58d977d54e0 100644 --- a/sys/arch/sparc64/sparc64/disksubr.c +++ b/sys/arch/sparc64/sparc64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.57 2009/08/13 15:23:11 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.58 2010/02/26 23:11:57 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.13 2000/12/17 22:39:18 pk Exp $ */ /* @@ -399,6 +399,7 @@ disklabel_bsd_to_sun(struct disklabel *lp, struct sun_disklabel *sl) return (EINVAL); /* Format conversion. */ + bzero(sl, sizeof(*sl)); memcpy(sl->sl_text, lp->d_packname, sizeof(lp->d_packname)); sl->sl_rpm = lp->d_rpm; sl->sl_pcylinders = lp->d_ncylinders + lp->d_acylinders; /* XXX */ |