From owner-svn-src-all@FreeBSD.ORG  Thu Dec 18 18:44:47 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 631001065670;
	Thu, 18 Dec 2008 18:44:47 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 58C458FC0C;
	Thu, 18 Dec 2008 18:44:47 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBIIilZo049457;
	Thu, 18 Dec 2008 18:44:47 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBIIikVF049455;
	Thu, 18 Dec 2008 18:44:46 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <200812181844.mBIIikVF049455@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Thu, 18 Dec 2008 18:44:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186291 - head/sbin/mount
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Dec 2008 18:44:47 -0000

Author: obrien
Date: Thu Dec 18 18:44:46 2008
New Revision: 186291
URL: http://svn.freebsd.org/changeset/base/186291

Log:
  Be a little bit more pestimistic in argument handling - check if we've
  overflown our internal buffer (though after the fact), and s/strncpy/strlcpy/
  
  Reviewed by:	rodrigc
  Obtained from:	Juniper Networks

Modified:
  head/sbin/mount/mount.c
  head/sbin/mount/mount_fs.c

Modified: head/sbin/mount/mount.c
==============================================================================
--- head/sbin/mount/mount.c	Thu Dec 18 18:29:15 2008	(r186290)
+++ head/sbin/mount/mount.c	Thu Dec 18 18:44:46 2008	(r186291)
@@ -68,6 +68,8 @@ static const char rcsid[] =
 #define MOUNT_META_OPTION_FSTAB		"fstab"
 #define MOUNT_META_OPTION_CURRENT	"current"
 
+#define	MAX_ARGS			100
+
 int debug, fstab_style, verbose;
 
 char   *catopt(char *, const char *);
@@ -501,7 +503,7 @@ int
 mountfs(const char *vfstype, const char *spec, const char *name, int flags,
 	const char *options, const char *mntopts)
 {
-	char *argv[100];
+	char *argv[MAX_ARGS];
 	struct statfs sf;
 	int argc, i, ret;
 	char *optbuf, execname[PATH_MAX], mntpath[PATH_MAX];
@@ -546,6 +548,10 @@ mountfs(const char *vfstype, const char 
 	argv[argc++] = strdup(name);
 	argv[argc] = NULL;
 
+	if (MAX_ARGS <= argc )
+		errx(1, "Cannot process more than %d mount arguments",
+		    MAX_ARGS);
+
 	if (debug) {
 		if (use_mountprog(vfstype))
 			printf("exec: mount_%s", vfstype);

Modified: head/sbin/mount/mount_fs.c
==============================================================================
--- head/sbin/mount/mount_fs.c	Thu Dec 18 18:29:15 2008	(r186290)
+++ head/sbin/mount/mount_fs.c	Thu Dec 18 18:44:46 2008	(r186291)
@@ -88,7 +88,7 @@ mount_fs(const char *vfstype, int argc, 
 	char *p, *val;
 	int ret;
 
-	strncpy(fstype, vfstype, sizeof(fstype));
+	strlcpy(fstype, vfstype, sizeof(fstype));
 	memset(errmsg, 0, sizeof(errmsg));
 
 	getmnt_silent = 1;