From owner-svn-src-head@freebsd.org  Sat Dec 31 12:03:27 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23B3AC99D91;
 Sat, 31 Dec 2016 12:03:27 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E76FC13AB;
 Sat, 31 Dec 2016 12:03:26 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBVC3Qv5067500;
 Sat, 31 Dec 2016 12:03:26 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBVC3Q8M067499;
 Sat, 31 Dec 2016 12:03:26 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201612311203.uBVC3Q8M067499@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 31 Dec 2016 12:03:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r310952 - head/contrib/bsnmp/snmp_mibII
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Dec 2016 12:03:27 -0000

Author: ngie
Date: Sat Dec 31 12:03:25 2016
New Revision: 310952
URL: https://svnweb.freebsd.org/changeset/base/310952

Log:
  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
  
  MFC after:	1 week
  Reported by:	Coverity
  CID:		1006827, 1006828

Modified:
  head/contrib/bsnmp/snmp_mibII/mibII.c

Modified: head/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- head/contrib/bsnmp/snmp_mibII/mibII.c	Sat Dec 31 11:57:37 2016	(r310951)
+++ head/contrib/bsnmp/snmp_mibII/mibII.c	Sat Dec 31 12:03:25 2016	(r310952)
@@ -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;