From owner-svn-src-user@FreeBSD.ORG  Thu Oct 16 10:47:39 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D84291065687;
	Thu, 16 Oct 2008 10:47:39 +0000 (UTC)
	(envelope-from netchild@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C6E7E8FC13;
	Thu, 16 Oct 2008 10:47:39 +0000 (UTC)
	(envelope-from netchild@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 m9GAldw5059610;
	Thu, 16 Oct 2008 10:47:39 GMT
	(envelope-from netchild@svn.freebsd.org)
Received: (from netchild@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9GAld9n059608;
	Thu, 16 Oct 2008 10:47:39 GMT
	(envelope-from netchild@svn.freebsd.org)
Message-Id: <200810161047.m9GAld9n059608@svn.freebsd.org>
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Thu, 16 Oct 2008 10:47:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r183947 - in user/netchild/misc/src/sys/gnu/fs: ext2fs
	reiserfs
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Oct 2008 10:47:39 -0000

Author: netchild
Date: Thu Oct 16 10:47:39 2008
New Revision: 183947
URL: http://svn.freebsd.org/changeset/base/183947

Log:
  Some more error checking. XXX: Too much defensive programming?

Modified:
  user/netchild/misc/src/sys/gnu/fs/ext2fs/ext2_vfsops.c
  user/netchild/misc/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c

Modified: user/netchild/misc/src/sys/gnu/fs/ext2fs/ext2_vfsops.c
==============================================================================
--- user/netchild/misc/src/sys/gnu/fs/ext2fs/ext2_vfsops.c	Thu Oct 16 10:45:39 2008	(r183946)
+++ user/netchild/misc/src/sys/gnu/fs/ext2fs/ext2_vfsops.c	Thu Oct 16 10:47:39 2008	(r183947)
@@ -145,7 +145,10 @@ ext2_mount(mp, td)
 	if (vfs_filteropt(opts, ext2_opts))
 		return (EINVAL);
 
-	vfs_getopt(opts, "fspath", (void **)&path, NULL);
+	/* The fspath has to exist (invariant), but better safe than sorry. */
+	error = vfs_getopt(opts, "fspath", (void **)&path, NULL);
+	if (error != 0)
+		return (error);
 	/* Double-check the length of path.. */
 	if (strlen(path) >= MAXMNTLEN - 1)
 		return (ENAMETOOLONG);

Modified: user/netchild/misc/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
==============================================================================
--- user/netchild/misc/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c	Thu Oct 16 10:45:39 2008	(r183946)
+++ user/netchild/misc/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c	Thu Oct 16 10:47:39 2008	(r183947)
@@ -89,8 +89,10 @@ reiserfs_mount(struct mount *mp, struct 
 	opts = mp->mnt_optnew;
 
 	/* `fspath' contains the mount point (eg. /mnt/linux); REQUIRED */
-	vfs_getopt(opts, "fspath", (void **)&path, NULL);
-	reiserfs_log(LOG_INFO, "mount point is `%s'\n", path);
+	if (vfs_getopt(opts, "fspath", (void **)&path, NULL) == 0)
+		reiserfs_log(LOG_INFO, "mount point is `%s'\n", path);
+	else
+		reiserfs_log(LOG_WARNING, "mount point is `<unknown>'\n");
 
 	/* `from' contains the device name (eg. /dev/ad0s1); REQUIRED */
 	fspec = NULL;