Change snprintf to strncpy.

Also add a comment about a bogus assumption in the current code found at
bsdcon by jhb.

1 files changed, 9 insertions, 2 deletions

diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index ca573defb63a..f3d20dc279de 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -255,8 +255,15 @@ allocate_driver(struct slot *slt, struct dev_desc *desc)
 			goto err;
 	}
 	err = device_probe_and_attach(child);
-	snprintf(desc->name, sizeof(desc->name), "%s",
-		 device_get_nameunit(child));
+	/*
+	 * XXX We unwisely assume that the detach code won't run while the
+	 * XXX the attach code is attaching.  Someone should put some
+	 * XXX interlock code.  This can happen if probe/attach takes a while
+	 * XXX and the user ejects the card, which causes the detach
+	 * XXX function to be called.
+	 */
+	strncpy(desc->name, device_get_nameunit(child), sizeof(desc->name));
+	desc->name[sizeof(desc->name) - 1] = '\0';
 err:
 	if (err)
 		device_delete_child(pccarddev, child);