patch-2.3.51 linux/kernel/sys.c

• Lines: 55
• Date: Fri Mar 10 11:01:19 2000
• Orig file: v2.3.50/linux/kernel/sys.c
• Orig date: Sat Feb 26 22:32:07 2000

diff -u --recursive --new-file v2.3.50/linux/kernel/sys.c linux/kernel/sys.c
@@ -801,23 +801,39 @@
 	return 0;
 }
 
-int in_group_p(gid_t grp)
+static int supplemental_group_member(gid_t grp)
 {
-	if (grp != current->fsgid) {
-		int i = current->ngroups;
-		if (i) {
-			gid_t *groups = current->groups;
-			do {
-				if (*groups == grp)
-					goto out;
-				groups++;
-				i--;
-			} while (i);
-		}
-		return 0;
+	int i = current->ngroups;
+
+	if (i) {
+		gid_t *groups = current->groups;
+		do {
+			if (*groups == grp)
+				return 1;
+			groups++;
+			i--;
+		} while (i);
 	}
-out:
-	return 1;
+	return 0;
+}
+
+/*
+ * Check whether we're fsgid/egid or in the supplemental group..
+ */
+int in_group_p(gid_t grp)
+{
+	int retval = 1;
+	if (grp != current->fsgid)
+		retval = supplemental_group_member(grp);
+	return retval;
+}
+
+int in_egroup_p(gid_t grp)
+{
+	int retval = 1;
+	if (grp != current->egid)
+		retval = supplemental_group_member(grp);
+	return retval;
 }
 
 DECLARE_RWSEM(uts_sem);