 @@ -1,14 +1,14 @@
-/*	$NetBSD: dk.c,v 1.93 2016/12/24 16:39:55 mlelstv Exp $	*/
+/*	$NetBSD: dk.c,v 1.94 2017/01/19 00:44:40 maya Exp $	*/
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.93 2016/12/24 16:39:55 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.94 2017/01/19 00:44:40 maya Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/pool.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 @@ -676,27 +676,27 @@ dkwedge_delall1(struct disk *pdk, bool i
 	if (!idleonly) flags |= DETACH_FORCE;
 	for (;;) {
 		mutex_enter(&pdk->dk_openlock);
 		LIST_FOREACH(sc, &pdk->dk_wedges, sc_plink) {
 			if (!idleonly || sc->sc_dk.dk_openmask == 0)
 				break;
+		}
 		if (sc == NULL) {
 			KASSERT(idleonly || pdk->dk_nwedges == 0);
 			mutex_exit(&pdk->dk_openlock);
 			return;
+		}
-		strcpy(dkw.dkw_parent, pdk->dk_name);
+		strlcpy(dkw.dkw_parent, pdk->dk_name, sizeof(dkw.dkw_parent));
 		strlcpy(dkw.dkw_devname, device_xname(sc->sc_dev),
 			sizeof(dkw.dkw_devname));
 		mutex_exit(&pdk->dk_openlock);
 		(void) dkwedge_del1(&dkw, flags);
+	}
+}
 /*
  * dkwedge_list:	[exported function]
+ *
  *	List all of the wedges on a particular disk.
  */
 int
 @@ -723,30 +723,31 @@ dkwedge_list(struct disk *pdk, struct dk
 	mutex_enter(&pdk->dk_openlock);
 	LIST_FOREACH(sc, &pdk->dk_wedges, sc_plink) {
 		if (uio.uio_resid < sizeof(dkw))
 			break;
 		if (sc->sc_state != DKW_STATE_RUNNING)
 			continue;
 		strlcpy(dkw.dkw_devname, device_xname(sc->sc_dev),
 			sizeof(dkw.dkw_devname));
 		memcpy(dkw.dkw_wname, sc->sc_wname, sizeof(dkw.dkw_wname));
 		dkw.dkw_wname[sizeof(dkw.dkw_wname) - 1] = '\0';
-		strcpy(dkw.dkw_parent, sc->sc_parent->dk_name);
+		strlcpy(dkw.dkw_parent, sc->sc_parent->dk_name,
 		    sizeof(dkw.dkw_parent));
 		dkw.dkw_offset = sc->sc_offset;
 		dkw.dkw_size = sc->sc_size;
-		strcpy(dkw.dkw_ptype, sc->sc_ptype);
+		strlcpy(dkw.dkw_ptype, sc->sc_ptype, sizeof(dkw.dkw_ptype));
 		error = uiomove(&dkw, sizeof(dkw), &uio);
 		if (error)
 			break;
 		dkwl->dkwl_ncopied++;
+	}
 	dkwl->dkwl_nwedges = pdk->dk_nwedges;
 	mutex_exit(&pdk->dk_openlock);
 	return (error);
+}
 device_t
 @@ -1487,30 +1488,31 @@ dkioctl(dev_t dev, u_long cmd, void *dat
 		else
 			error = VOP_IOCTL(sc->sc_parent->dk_rawvp,
 					  cmd, data, flag,
 					  l != NULL ? l->l_cred : NOCRED);
 		break;
 	case DIOCGWEDGEINFO:
+	    {
 		struct dkwedge_info *dkw = (void *) data;
 		strlcpy(dkw->dkw_devname, device_xname(sc->sc_dev),
 			sizeof(dkw->dkw_devname));
 	    	memcpy(dkw->dkw_wname, sc->sc_wname, sizeof(dkw->dkw_wname));
 		dkw->dkw_wname[sizeof(dkw->dkw_wname) - 1] = '\0';
-		strcpy(dkw->dkw_parent, sc->sc_parent->dk_name);
+		strlcpy(dkw->dkw_parent, sc->sc_parent->dk_name,
 		    sizeof(dkw->dkw_parent));
 		dkw->dkw_offset = sc->sc_offset;
 		dkw->dkw_size = sc->sc_size;
-		strcpy(dkw->dkw_ptype, sc->sc_ptype);
+		strlcpy(dkw->dkw_ptype, sc->sc_ptype, sizeof(dkw->dkw_ptype));
 		break;
+	    }
 	default:
 		error = ENOTTY;
+	}
 	return (error);
+}
 /*
  * dkdiscard:		[devsw entry point]

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dkwedge_apple.c,v 1.2 2015/01/24 02:58:56 christos Exp $	*/
+/*	$NetBSD: dkwedge_apple.c,v 1.3 2017/01/19 00:44:40 maya Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Apple support for disk wedges
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_apple.c,v 1.2 2015/01/24 02:58:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_apple.c,v 1.3 2017/01/19 00:44:40 maya Exp $");
 #include <sys/param.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #endif
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/disk.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/bitops.h>
 #include <sys/bootblock.h>
 @@ -207,28 +207,28 @@ dkwedge_discover_apple(struct disk *pdk,
 		if (i == __arraycount(map))
 			continue;
 		ptype = map[i].type;
 		memcpy(&ab, ae->pmBootArgs, sizeof(ab));
 		swap_apple_blockzeroblock(&ab);
 		if (ab.bzbMagic == APPLE_BZB_MAGIC) {
 			if (ab.bzbType == APPLE_BZB_TYPESWAP)
 				ptype = DKW_PTYPE_SWAP;
+		}
 		struct dkwedge_info dkw;
-		strcpy(dkw.dkw_ptype, ptype);
+		strlcpy(dkw.dkw_ptype, ptype, sizeof(dkw.dkw_ptype));
-		strcpy(dkw.dkw_parent, pdk->dk_name);
+		strlcpy(dkw.dkw_parent, pdk->dk_name, sizeof(dkw.dkw_parent));
 		dkw.dkw_offset = ae->pmPyPartStart;
 		dkw.dkw_size = ae->pmPartBlkCnt;
 		strlcpy(dkw.dkw_wname, ae->pmPartName, sizeof(dkw.dkw_wname));
 		error = dkwedge_add(&dkw);
 		if (error == EEXIST)
 			aprint_error("%s: wedge named '%s' already "
 			    "exists, manual intervention required\n",
 			    pdk->dk_name, dkw.dkw_wname);
 		else if (error)
 			aprint_error("%s: error %d adding partition "
 			    "%s type %s\n", pdk->dk_name, error,
 			    ae->pmPartType, dkw.dkw_ptype);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dkwedge_gpt.c,v 1.17 2016/04/28 00:35:24 christos Exp $	*/
+/*	$NetBSD: dkwedge_gpt.c,v 1.18 2017/01/19 00:44:40 maya Exp $	*/
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * EFI GUID Partition Table support for disk wedges
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.17 2016/04/28 00:35:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.18 2017/01/19 00:44:40 maya Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/disk.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/disklabel_gpt.h>
 #include <sys/uuid.h>
 /* UTF-8 encoding stuff */
 @@ -229,57 +229,57 @@ dkwedge_discover_gpt(struct disk *pdk, s
 		if (memcmp(&ptype_guid, &ent_type_unused,
 			   sizeof(ptype_guid)) == 0)
 			continue;
 		uuid_dec_le(ent->ent_guid, &ent_guid);
 		uuid_snprintf(ptype_guid_str, sizeof(ptype_guid_str),
 		    &ptype_guid);
 		uuid_snprintf(ent_guid_str, sizeof(ent_guid_str),
 		    &ent_guid);
 		/* figure out the type */
 		ptype = gpt_ptype_guid_to_str(&ptype_guid);
-		strcpy(dkw.dkw_ptype, ptype);
+		strlcpy(dkw.dkw_ptype, ptype, sizeof(dkw.dkw_ptype));
-		strcpy(dkw.dkw_parent, pdk->dk_name);
+		strlcpy(dkw.dkw_parent, pdk->dk_name, sizeof(dkw.dkw_parent));
 		dkw.dkw_offset = le64toh(ent->ent_lba_start);
 		dkw.dkw_size = le64toh(ent->ent_lba_end) - dkw.dkw_offset + 1;
 		/* XXX Make sure it falls within the disk's data area. */
 		if (ent->ent_name[0] == 0x0000)
-			strcpy(dkw.dkw_wname, ent_guid_str);
+			strlcpy(dkw.dkw_wname, ent_guid_str, sizeof(dkw.dkw_wname));
 		else {
 			c = dkw.dkw_wname;
 			r = sizeof(dkw.dkw_wname) - 1;
 			for (j = 0; ent->ent_name[j] != 0x0000; j++) {
 				n = wput_utf8(c, r, le16toh(ent->ent_name[j]));
 				if (n == 0)
 					break;
 				c += n; r -= n;
+			}
 			*c = '\0';
+		}
 		/*
 		 * Try with the partition name first.  If that fails,
 		 * use the GUID string.  If that fails, punt.
 		 */
 		if ((error = dkwedge_add(&dkw)) == EEXIST &&
 		    strcmp(dkw.dkw_wname, ent_guid_str) != 0) {
 			char orig[sizeof(dkw.dkw_wname)];
-			strcpy(orig, dkw.dkw_wname);
+			strlcpy(orig, dkw.dkw_wname, sizeof(orig));
-			strcpy(dkw.dkw_wname, ent_guid_str);
+			strlcpy(dkw.dkw_wname, ent_guid_str, sizeof(dkw.dkw_wname));
 			error = dkwedge_add(&dkw);
 			if (!error)
 				aprint_error("%s: wedge named '%s' already "
 				    "existed, using '%s'\n", pdk->dk_name,
 				    orig, ent_guid_str);
+		}
 		if (error == EEXIST)
 			aprint_error("%s: wedge named '%s' already exists, "
 			    "manual intervention required\n", pdk->dk_name,
 			    dkw.dkw_wname);
 		else if (error)
 			aprint_error("%s: error %d adding entry %u (%s), "
 			    "type %s\n", pdk->dk_name, error, i, ent_guid_str,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dkwedge_mbr.c,v 1.9 2015/12/02 01:09:49 christos Exp $	*/
+/*	$NetBSD: dkwedge_mbr.c,v 1.10 2017/01/19 00:44:40 maya Exp $	*/
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Master Boot Record partition table support for disk wedges
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_mbr.c,v 1.9 2015/12/02 01:09:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_mbr.c,v 1.10 2017/01/19 00:44:40 maya Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/disk.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/bootblock.h>
 #include <sys/disklabel.h>
 typedef struct mbr_args {
 @@ -114,29 +114,29 @@ getparts(mbr_args_t *a, uint32_t off, ui
 			break;
+		}
 		if ((ptype = mbr_ptype_to_str(dp[i].mbrp_type)) == NULL) {
 			/*
 			 * XXX Should probably just add these...
 			 * XXX maybe just have an empty ptype?
 			 */
 			aprint_verbose("%s: skipping partition %d, "
 			    "type 0x%02x\n", a->pdk->dk_name, i,
 			    dp[i].mbrp_type);
 			continue;
+		}
-		strcpy(dkw.dkw_ptype, ptype);
+		strlcpy(dkw.dkw_ptype, ptype, sizeof(dkw.dkw_ptype));
-		strcpy(dkw.dkw_parent, a->pdk->dk_name);
+		strlcpy(dkw.dkw_parent, a->pdk->dk_name, sizeof(dkw.dkw_parent));
 		dkw.dkw_offset = le32toh(dp[i].mbrp_start);
 		dkw.dkw_size = le32toh(dp[i].mbrp_size);
 		/*
 		 * These get historical disk naming style
 		 * wedge names.  We start at 'e', and reserve
 		 * 4 slots for each MBR we parse.
+		 *
 		 * XXX For FAT, we should extract the FAT volume
 		 * XXX name.
 		 */
 		snprintf(dkw.dkw_wname, sizeof(dkw.dkw_wname),
 		    "%s%c", a->pdk->dk_name,