From owner-svn-src-all@freebsd.org  Fri May 20 06:28:00 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 08BFBB41D7C;
 Fri, 20 May 2016 06:28:00 +0000 (UTC)
 (envelope-from truckman@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 CDB381A1F;
 Fri, 20 May 2016 06:27:59 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4K6Rx7C081783;
 Fri, 20 May 2016 06:27:59 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4K6Rxkh081782;
 Fri, 20 May 2016 06:27:59 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201605200627.u4K6Rxkh081782@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Fri, 20 May 2016 06:27:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r300270 - stable/10/usr.sbin/edquota
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 May 2016 06:28:00 -0000

Author: truckman
Date: Fri May 20 06:27:58 2016
New Revision: 300270
URL: https://svnweb.freebsd.org/changeset/base/300270

Log:
  MFC r299579
  
  Use strlcpy() instead of strncpy() to ensure that qup->fsname is NUL
  terminated.  Don't bother checking for truncation since the subsequent
  quota_read() should detect that and fail.
  
  Reported by:	Coverity
  CID:		1009980

Modified:
  stable/10/usr.sbin/edquota/edquota.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/edquota/edquota.c
==============================================================================
--- stable/10/usr.sbin/edquota/edquota.c	Fri May 20 06:24:16 2016	(r300269)
+++ stable/10/usr.sbin/edquota/edquota.c	Fri May 20 06:27:58 2016	(r300270)
@@ -390,7 +390,7 @@ getprivs(long id, int quotatype, char *f
 		if ((qup = (struct quotause *)calloc(1, sizeof(*qup))) == NULL)
 			errx(2, "out of memory");
 		qup->qf = qf;
-		strncpy(qup->fsname, fs->fs_file, sizeof(qup->fsname));
+		strlcpy(qup->fsname, fs->fs_file, sizeof(qup->fsname));
 		if (quota_read(qf, &qup->dqblk, id) == -1) {
 			warn("cannot read quotas on %s", fs->fs_file);
 			freeprivs(qup);