From owner-svn-src-head@FreeBSD.ORG  Sat Nov 10 19:32:17 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 66D31116;
 Sat, 10 Nov 2012 19:32:17 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 32DF18FC08;
 Sat, 10 Nov 2012 19:32:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAAJWHO2092963;
 Sat, 10 Nov 2012 19:32:17 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAAJWHeY092962;
 Sat, 10 Nov 2012 19:32:17 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201211101932.qAAJWHeY092962@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 10 Nov 2012 19:32:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242875 - head/sys/fs/fuse
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Nov 2012 19:32:17 -0000

Author: attilio
Date: Sat Nov 10 19:32:16 2012
New Revision: 242875
URL: http://svnweb.freebsd.org/changeset/base/242875

Log:
  - Protect mnt_data and mnt_flags under the mount interlock
  - Move mp->mnt_stat manipulation where all of them happens
  
  Reported by:	davide
  Discussed with:	kib
  Tested by:	flo
  MFC after:	2 months
  X-MFC:		241519, 242536,242616, 242727

Modified:
  head/sys/fs/fuse/fuse_vfsops.c

Modified: head/sys/fs/fuse/fuse_vfsops.c
==============================================================================
--- head/sys/fs/fuse/fuse_vfsops.c	Sat Nov 10 16:08:21 2012	(r242874)
+++ head/sys/fs/fuse/fuse_vfsops.c	Sat Nov 10 19:32:16 2012	(r242875)
@@ -234,8 +234,10 @@ fuse_vfsop_mount(struct mount *mp)
 	if (mp->mnt_flag & MNT_UPDATE)
 		return EOPNOTSUPP;
 
+	MNT_ILOCK(mp);
 	mp->mnt_flag |= MNT_SYNCHRONOUS;
 	mp->mnt_data = NULL;
+	MNT_IUNLOCK(mp);
 	/* Get the new options passed to mount */
 	opts = mp->mnt_optnew;
 
@@ -323,22 +325,20 @@ fuse_vfsop_mount(struct mount *mp)
 		FUSE_UNLOCK();
 		goto out;
 	}
-	/* We need this here as this slot is used by getnewvnode() */
-	mp->mnt_stat.f_iosize = PAGE_SIZE;
-	mp->mnt_data = data;
 	data->ref++;
 	data->mp = mp;
 	data->dataflags |= mntopts;
 	data->max_read = max_read;
 	data->daemon_timeout = daemon_timeout;
-#ifdef XXXIP
-	if (!priv_check(td, PRIV_VFS_FUSE_SYNC_UNMOUNT))
-		data->dataflags |= FSESS_CAN_SYNC_UNMOUNT;
-#endif
 	FUSE_UNLOCK();
 
 	vfs_getnewfsid(mp);
+	MNT_ILOCK(mp);
+	mp->mnt_data = data;
 	mp->mnt_flag |= MNT_LOCAL;
+	MNT_IUNLOCK(mp);
+	/* We need this here as this slot is used by getnewvnode() */
+	mp->mnt_stat.f_iosize = PAGE_SIZE;
 	if (subtype) {
 		strlcat(mp->mnt_stat.f_fstypename, ".", MFSNAMELEN);
 		strlcat(mp->mnt_stat.f_fstypename, subtype, MFSNAMELEN);