svn commit: r311598 - stable/10/contrib/bsnmp/snmp_mibII

Ngie Cooper ngie at FreeBSD.org
Sat Jan 7 08:53:59 UTC 2017


Author: ngie
Date: Sat Jan  7 08:53:58 2017
New Revision: 311598
URL: https://svnweb.freebsd.org/changeset/base/311598

Log:
  MFC r310952:
  
  MIB-II: use strlcpy instead of strcpy when copying {descr,name}
  
  This is of course to avoid buffer overruns
  
  The remaining strcpy instance in the module needs to be audited for
  correctness
  
  CID:		1006827, 1006828

Modified:
  stable/10/contrib/bsnmp/snmp_mibII/mibII.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- stable/10/contrib/bsnmp/snmp_mibII/mibII.c	Sat Jan  7 08:48:51 2017	(r311597)
+++ stable/10/contrib/bsnmp/snmp_mibII/mibII.c	Sat Jan  7 08:53:58 2017	(r311598)
@@ -204,7 +204,7 @@ mib_if_set_dyn(const char *name)
 			return;
 	if ((d = malloc(sizeof(*d))) == NULL)
 		err(1, NULL);
-	strcpy(d->name, name);
+	strlcpy(d->name, name, sizeof(d->name));
 	SLIST_INSERT_HEAD(&mibdynif_list, d, link);
 }
 
@@ -774,8 +774,8 @@ mibif_create(u_int sysindex, const char 
 	memset(ifp->private, 0, sizeof(struct mibif_private));
 
 	ifp->sysindex = sysindex;
-	strcpy(ifp->name, name);
-	strcpy(ifp->descr, name);
+	strlcpy(ifp->name, name, sizeof(ifp->name));
+	strlcpy(ifp->descr, name, sizeof(ifp->descr));
 	ifp->spec_oid = oid_zeroDotZero;
 
 	map = NULL;


More information about the svn-src-stable-10 mailing list