# HG changeset patch
# User yz147064
# Date 1175242705 25200
# Node ID ef76fe400493b15dbceda553874c5ce3428c704e
# Parent  ca43a692451e88f547d5d36c052391da48e3dff4
6537453 possible invalid memory access in dladm utility

diff -r ca43a692451e -r ef76fe400493 usr/src/cmd/dladm/dladm.c
--- a/usr/src/cmd/dladm/dladm.c	Thu Mar 29 21:54:29 2007 -0700
+++ b/usr/src/cmd/dladm/dladm.c	Fri Mar 30 01:18:25 2007 -0700
@@ -113,8 +113,8 @@
 static uint64_t	mac_ifspeed(const char *);
 static void	stats_total(pktsum_t *, pktsum_t *, pktsum_t *);
 static void	stats_diff(pktsum_t *, pktsum_t *, pktsum_t *);
-static const char	*mac_link_state(const char *);
-static const char	*mac_link_duplex(const char *);
+static const char	*mac_link_state(const char *, char *);
+static const char	*mac_link_duplex(const char *, char *);
 
 static boolean_t str2int(const char *, int *);
 static void	die(const char *, ...);
@@ -891,8 +891,8 @@
 		    port->lp_mac, mac_addr));
 		(void) printf("\t %5uMb", (int)(mac_ifspeed(dev) /
 		    1000000ull));
-		(void) printf("\t%s", mac_link_duplex(dev));
-		(void) printf("\t%s", mac_link_state(dev));
+		(void) printf("\t%s", mac_link_duplex(dev, buf));
+		(void) printf("\t%s", mac_link_state(dev, buf));
 		(void) printf("\t%s\n",
 		    dladm_aggr_portstate2str(port->lp_state, buf));
 
@@ -901,8 +901,8 @@
 		    dladm_aggr_macaddr2str(port->lp_mac, mac_addr));
 		(void) printf(" speed=%u", (int)(mac_ifspeed(dev) /
 		    1000000ull));
-		(void) printf(" duplex=%s", mac_link_duplex(dev));
-		(void) printf(" link=%s", mac_link_state(dev));
+		(void) printf(" duplex=%s", mac_link_duplex(dev, buf));
+		(void) printf(" link=%s", mac_link_state(dev, buf));
 		(void) printf(" port=%s",
 		    dladm_aggr_portstate2str(port->lp_state, buf));
 	}
@@ -1048,21 +1048,22 @@
 show_dev(void *arg, const char *dev)
 {
 	show_mac_state_t *state = (show_mac_state_t *)arg;
+	char buf[DLADM_STRSIZE];
 
 	(void) printf("%s", dev);
 
 	if (!state->ms_parseable) {
 		(void) printf(gettext("\t\tlink: %s"),
-		    mac_link_state(dev));
+		    mac_link_state(dev, buf));
 		(void) printf(gettext("\tspeed: %5uMb"),
 		    (unsigned int)(mac_ifspeed(dev) / 1000000ull));
 		(void) printf(gettext("\tduplex: %s\n"),
-		    mac_link_duplex(dev));
+		    mac_link_duplex(dev, buf));
 	} else {
-		(void) printf(" link=%s", mac_link_state(dev));
+		(void) printf(" link=%s", mac_link_state(dev, buf));
 		(void) printf(" speed=%u",
 		    (unsigned int)(mac_ifspeed(dev) / 1000000ull));
-		(void) printf(" duplex=%s\n", mac_link_duplex(dev));
+		(void) printf(" duplex=%s\n", mac_link_duplex(dev, buf));
 	}
 }
 
@@ -1576,29 +1577,28 @@
 }
 
 static const char *
-mac_link_state(const char *dev)
+mac_link_state(const char *dev, char *buf)
 {
 	link_state_t	link_state;
-	char		buf[DLADM_STRSIZE];
 
 	if (get_single_mac_stat(dev, "link_state", KSTAT_DATA_UINT32,
 	    &link_state) != 0) {
-		return ("unknown");
+		(void) strlcpy(buf, "unknown", DLADM_STRSIZE);
+		return (buf);
 	}
 
 	return (dladm_linkstate2str(link_state, buf));
 }
 
-
 static const char *
-mac_link_duplex(const char *dev)
+mac_link_duplex(const char *dev, char *buf)
 {
 	link_duplex_t	link_duplex;
-	char		buf[DLADM_STRSIZE];
 
 	if (get_single_mac_stat(dev, "link_duplex", KSTAT_DATA_UINT32,
 	    &link_duplex) != 0) {
-		return ("unknown");
+		(void) strlcpy(buf, "unknown", DLADM_STRSIZE);
+		return (buf);
 	}
 
 	return (dladm_linkduplex2str(link_duplex, buf));