Rename three quota privileges from the UFS privilege namespace to the

VFS privilege namespace: exceedquota, getquota, and setquota.  Leave
UFS-specific quota configuration privileges in the UFS name space.

This renumbers VFS and UFS privileges, so requires rebuilding modules
if you are using security policies aware of privilege identifiers.
This is likely no one at this point since none of the committed MAC
policies use the privilege checks.

3 files changed, 34 insertions, 34 deletions

diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index 8495fb9..98deb3f 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -621,8 +621,8 @@ prison_priv_check(struct ucred *cred, int priv)
 		 * properties.  These should likely be conditional on a
 		 * configuration option.
 		 */
-	case PRIV_UFS_GETQUOTA:
-	case PRIV_UFS_SETQUOTA:
+	case PRIV_VFS_GETQUOTA:
+	case PRIV_VFS_SETQUOTA:
 
 		/*
 		 * Since Jail relies on chroot() to implement file system
diff --git a/sys/sys/priv.h b/sys/sys/priv.h
index d77622b..62327ca 100644
--- a/sys/sys/priv.h
+++ b/sys/sys/priv.h
@@ -224,12 +224,9 @@
  * UFS-specific privileges.
  */
 #define	PRIV_UFS_EXTATTRCTL	270	/* Can configure EAs on UFS1. */
-#define	PRIV_UFS_GETQUOTA	271	/* getquota(). */
-#define	PRIV_UFS_QUOTAOFF	272	/* quotaoff(). */
-#define	PRIV_UFS_QUOTAON	273	/* quotaon(). */
-#define	PRIV_UFS_SETQUOTA	274	/* setquota(). */
-#define	PRIV_UFS_SETUSE		275	/* setuse(). */
-#define	PRIV_UFS_EXCEEDQUOTA	276	/* Exempt from quota restrictions. */
+#define	PRIV_UFS_QUOTAOFF	271	/* quotaoff(). */
+#define	PRIV_UFS_QUOTAON	272	/* quotaon(). */
+#define	PRIV_UFS_SETUSE		273	/* setuse(). */
 
 /*
  * VFS privileges.
@@ -244,27 +241,30 @@
 #define	PRIV_VFS_CHOWN		317	/* Can set user; group to non-member. */
 #define	PRIV_VFS_CHROOT		318	/* chroot(). */
 #define	PRIV_VFS_CLEARSUGID	319	/* Don't clear sugid on change. */
-#define	PRIV_VFS_EXTATTR_SYSTEM	320	/* Operate on system EA namespace. */
-#define	PRIV_VFS_FCHROOT	321	/* fchroot(). */
-#define	PRIV_VFS_FHOPEN		322	/* Can fhopen(). */
-#define	PRIV_VFS_FHSTAT		323	/* Can fhstat(). */
-#define	PRIV_VFS_FHSTATFS	324	/* Can fhstatfs(). */
-#define	PRIV_VFS_GENERATION	325	/* stat() returns generation number. */
-#define	PRIV_VFS_GETFH		326	/* Can retrieve file handles. */
-#define	PRIV_VFS_LINK		327	/* bsd.hardlink_check_uid */
-#define	PRIV_VFS_MKNOD_BAD	328	/* Can mknod() to mark bad inodes. */
-#define	PRIV_VFS_MKNOD_DEV	329	/* Can mknod() to create dev nodes. */
-#define	PRIV_VFS_MKNOD_WHT	330	/* Can mknod() to create whiteout. */
-#define	PRIV_VFS_MOUNT		331	/* Can mount(). */
-#define	PRIV_VFS_MOUNT_OWNER	332	/* Override owner on user mounts. */
-#define	PRIV_VFS_MOUNT_EXPORTED	333	/* Can set MNT_EXPORTED on mount. */
-#define	PRIV_VFS_MOUNT_PERM	334	/* Override dev node perms at mount. */
-#define	PRIV_VFS_MOUNT_SUIDDIR	335	/* Can set MNT_SUIDDIR on mount. */
-#define	PRIV_VFS_MOUNT_NONUSER	336	/* Can perform a non-user mount. */
-#define	PRIV_VFS_SETGID		337	/* Can setgid if not in group. */
-#define	PRIV_VFS_STICKYFILE	338	/* Can set sticky bit on file. */
-#define	PRIV_VFS_SYSFLAGS	339	/* Can modify system flags. */
-#define	PRIV_VFS_UNMOUNT	340	/* Can unmount(). */
+#define	PRIV_VFS_EXCEEDQUOTA	320	/* Exempt from quota restrictions. */
+#define	PRIV_VFS_EXTATTR_SYSTEM	321	/* Operate on system EA namespace. */
+#define	PRIV_VFS_FCHROOT	322	/* fchroot(). */
+#define	PRIV_VFS_FHOPEN		323	/* Can fhopen(). */
+#define	PRIV_VFS_FHSTAT		324	/* Can fhstat(). */
+#define	PRIV_VFS_FHSTATFS	325	/* Can fhstatfs(). */
+#define	PRIV_VFS_GENERATION	326	/* stat() returns generation number. */
+#define	PRIV_VFS_GETFH		327	/* Can retrieve file handles. */
+#define	PRIV_VFS_GETQUOTA	328	/* getquota(). */
+#define	PRIV_VFS_LINK		329	/* bsd.hardlink_check_uid */
+#define	PRIV_VFS_MKNOD_BAD	330	/* Can mknod() to mark bad inodes. */
+#define	PRIV_VFS_MKNOD_DEV	331	/* Can mknod() to create dev nodes. */
+#define	PRIV_VFS_MKNOD_WHT	332	/* Can mknod() to create whiteout. */
+#define	PRIV_VFS_MOUNT		333	/* Can mount(). */
+#define	PRIV_VFS_MOUNT_OWNER	334	/* Override owner on user mounts. */
+#define	PRIV_VFS_MOUNT_EXPORTED	335	/* Can set MNT_EXPORTED on mount. */
+#define	PRIV_VFS_MOUNT_PERM	336	/* Override dev node perms at mount. */
+#define	PRIV_VFS_MOUNT_SUIDDIR	337	/* Can set MNT_SUIDDIR on mount. */
+#define	PRIV_VFS_MOUNT_NONUSER	338	/* Can perform a non-user mount. */
+#define	PRIV_VFS_SETGID		339	/* Can setgid if not in group. */
+#define	PRIV_VFS_SETQUOTA	340	/* setquota(). */
+#define	PRIV_VFS_STICKYFILE	341	/* Can set sticky bit on file. */
+#define	PRIV_VFS_SYSFLAGS	342	/* Can modify system flags. */
+#define	PRIV_VFS_UNMOUNT	343	/* Can unmount(). */
 
 /*
  * Virtual memory privileges.
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 55e91b9..b02fd94 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -187,7 +187,7 @@ chkdq(ip, change, cred, flags)
 		return (0);
 	}
 	if ((flags & FORCE) == 0 && priv_check_cred(cred,
-	    PRIV_UFS_EXCEEDQUOTA, 0)) {
+	    PRIV_VFS_EXCEEDQUOTA, 0)) {
 		for (i = 0; i < MAXQUOTAS; i++) {
 			if ((dq = ip->i_dquot[i]) == NODQUOT)
 				continue;
@@ -310,7 +310,7 @@ chkiq(ip, change, cred, flags)
 		return (0);
 	}
 	if ((flags & FORCE) == 0 && priv_check_cred(cred,
-	    PRIV_UFS_EXCEEDQUOTA, 0)) {
+	    PRIV_VFS_EXCEEDQUOTA, 0)) {
 		for (i = 0; i < MAXQUOTAS; i++) {
 			if ((dq = ip->i_dquot[i]) == NODQUOT)
 				continue;
@@ -620,7 +620,7 @@ getquota(td, mp, id, type, addr)
 	case USRQUOTA:
 		if ((td->td_ucred->cr_uid != id) && !unprivileged_get_quota) {
 			error = priv_check_cred(td->td_ucred,
-			    PRIV_UFS_GETQUOTA, SUSER_ALLOWJAIL);
+			    PRIV_VFS_GETQUOTA, SUSER_ALLOWJAIL);
 			if (error)
 				return (error);
 		}
@@ -630,7 +630,7 @@ getquota(td, mp, id, type, addr)
 		if (!groupmember(id, td->td_ucred) &&
 		    !unprivileged_get_quota) {
 			error = priv_check_cred(td->td_ucred,
-			    PRIV_UFS_GETQUOTA, SUSER_ALLOWJAIL);
+			    PRIV_VFS_GETQUOTA, SUSER_ALLOWJAIL);
 			if (error)
 				return (error);
 		}
@@ -665,7 +665,7 @@ setquota(td, mp, id, type, addr)
 	struct dqblk newlim;
 	int error;
 
-	error = priv_check_cred(td->td_ucred, PRIV_UFS_SETQUOTA,
+	error = priv_check_cred(td->td_ucred, PRIV_VFS_SETQUOTA,
 	    SUSER_ALLOWJAIL);
 	if (error)
 		return (error);