From 8612bd7aa029e97b21cb74b0c89c774dc52d7dc4 Mon Sep 17 00:00:00 2001
From: Kenneth R Westerback <krw@cvs.openbsd.org>
Date: Fri, 4 Apr 2003 02:21:27 +0000
Subject: sprintf -> snprintf, plus check for overflow in device name.

ok deraadt@ millert@
---
 sys/dev/ccd.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index e87d6a7f30a..f8df7bfb512 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccd.c,v 1.51 2003/03/28 02:39:07 millert Exp $	*/
+/*	$OpenBSD: ccd.c,v 1.52 2003/04/04 02:21:26 krw Exp $	*/
 /*	$NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $	*/
 
 /*-
@@ -289,7 +289,11 @@ ccdinit(ccd, cpaths, p)
 	cs->sc_size = 0;
 	cs->sc_ileave = ccd->ccd_interleave;
 	cs->sc_nccdisks = ccd->ccd_ndev;
-	sprintf(cs->sc_xname, "ccd%d", ccd->ccd_unit);	/* XXX */
+	if (snprintf(cs->sc_xname, sizeof(cs->sc_xname), "ccd%d",
+	    ccd->ccd_unit) >= sizeof(cs->sc_xname)) {
+		printf("ccdinit: device name too long.\n");
+		return(ENXIO);
+	}
 
 	/* Allocate space for the component info. */
 	cs->sc_cinfo = malloc(cs->sc_nccdisks * sizeof(struct ccdcinfo),
-- 
cgit v1.2.3