Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 16 Apr 2012 18:10:35 +0000 (UTC)
From:      Jaakko Heinonen <jh@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r234347 - head/sys/fs/tmpfs
Message-ID:  <201204161810.q3GIAZJe044529@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jh
Date: Mon Apr 16 18:10:34 2012
New Revision: 234347
URL: http://svn.freebsd.org/changeset/base/234347

Log:
  Sync tmpfs_chflags() with the recent changes to UFS:
  
  - Add a check for unsupported file flags.
  - Return EPERM when an user without PRIV_VFS_SYSFLAGS privilege attempts
    to toggle SF_SETTABLE flags.

Modified:
  head/sys/fs/tmpfs/tmpfs_subr.c

Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_subr.c	Mon Apr 16 18:07:42 2012	(r234346)
+++ head/sys/fs/tmpfs/tmpfs_subr.c	Mon Apr 16 18:10:34 2012	(r234347)
@@ -1078,6 +1078,11 @@ tmpfs_chflags(struct vnode *vp, int flag
 
 	node = VP_TO_TMPFS_NODE(vp);
 
+	if ((flags & ~(UF_NODUMP | UF_IMMUTABLE | UF_APPEND | UF_OPAQUE |
+	    UF_NOUNLINK | SF_ARCHIVED | SF_IMMUTABLE | SF_APPEND |
+	    SF_NOUNLINK | SF_SNAPSHOT)) != 0)
+		return (EOPNOTSUPP);
+
 	/* Disallow this operation if the file system is mounted read-only. */
 	if (vp->v_mount->mnt_flag & MNT_RDONLY)
 		return EROFS;
@@ -1093,27 +1098,22 @@ tmpfs_chflags(struct vnode *vp, int flag
 	 * flags, or modify flags if any system flags are set.
 	 */
 	if (!priv_check_cred(cred, PRIV_VFS_SYSFLAGS, 0)) {
-		if (node->tn_flags
-		  & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND)) {
+		if (node->tn_flags &
+		    (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND)) {
 			error = securelevel_gt(cred, 0);
 			if (error)
 				return (error);
 		}
-		/* Snapshot flag cannot be set or cleared */
-		if (((flags & SF_SNAPSHOT) != 0 &&
-		  (node->tn_flags & SF_SNAPSHOT) == 0) ||
-		  ((flags & SF_SNAPSHOT) == 0 &&
-		  (node->tn_flags & SF_SNAPSHOT) != 0))
+		/* The snapshot flag cannot be toggled. */
+		if ((flags ^ node->tn_flags) & SF_SNAPSHOT)
 			return (EPERM);
-		node->tn_flags = flags;
 	} else {
-		if (node->tn_flags
-		  & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND) ||
-		  (flags & UF_SETTABLE) != flags)
+		if (node->tn_flags &
+		    (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND) ||
+		    ((flags ^ node->tn_flags) & SF_SETTABLE))
 			return (EPERM);
-		node->tn_flags &= SF_SETTABLE;
-		node->tn_flags |= (flags & UF_SETTABLE);
 	}
+	node->tn_flags = flags;
 	node->tn_status |= TMPFS_NODE_CHANGED;
 
 	MPASS(VOP_ISLOCKED(vp));

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204161810.q3GIAZJe044529>