NGROUPS 2.6.2rc2
Subsystems (11)
(sorry if this dups, screwup in my aliases file)
Linus,
Attached is a patch to remove the NGROUPS limit (again). This patch is against linux-2.6.2rc2. If it is OK, I can make it bitkeeper accessible.
This does not use vmalloc, but instead uses an array of pages. It also will require a glibc patch which I will pop off as soon as I get the OK on this (I've been reworking this every few months for about 2 years now).
It does duplicate some code in the compat code for some architectures. I'll follow this up with a cleanup patch for that, I promise.
This patch changes the security interface for task_setgroups().
This throughly breaks intermezzo, though I don't know if anyone will notice.
What think? Can we get rid of this limit at long last? :)
Tim
Quoted 4 lines · Linus Torvalds
I'm definitely happier about this one._
_
Not that I'm any more thrilled about users using thousands of groups.But_this looks a bit saner.
Signature · 4 lines
Tim Hockin Sun Microsystems, Linux Software Engineering [email protected] All opinions are my own, not Sun's
===== include/linux/sched.h 1.178 vs edited =====
include/linux/sched.h +27 -2
@@ -329,6 +329,32 @@struct io_context ;/* See blkdev.h */ void exit_io_context (void ); +#define NGROUPS_SMALL 32 +#define NGROUPS_BLOCK ((int)(EXEC_PAGESIZE / sizeof(gid_t))) +struct group_info { +int ngroups; +atomic_t usage; +gid_t small_block[NGROUPS_SMALL ]; +int nblocks; +gid_t *blocks[0 ]; +}; + +#define get_group_info (info) do { \ + atomic_inc(&(info)->usage); \ +} while (0) + +#define put_group_info (info) do { \ + if (atomic_dec_and_test(&(info)->usage)) \ + groups_free(info); \ +} while (0) + +struct group_info *groups_alloc (int gidsetsize); +void groups_free (struct group_info *info); +int set_current_groups (struct group_info *info); +/* access the groups "array" with this macro */ +#define GROUP_AT (gi, i) ((gi)->blocks[(i)/NGROUPS_BLOCK][(i)%NGROUPS_BLOCK]) + +struct task_struct {volatile long state;/* -1 unrunnable, 0 runnable, >0 stopped */ struct thread_info *thread_info;
@@ -403,8 +429,7 @@/* process credentials */ uid_t uid,euid,suid,fsuid;gid_t gid,egid,sgid,fsgid; -int ngroups; -gid_t groups[NGROUPS ]; +struct group_info *group_info;kernel_cap_t cap_effective, cap_inheritable, cap_permitted; int keep_capabilities:1;struct user_struct *user;
===== include/linux/init_task.h 1.27 vs edited =====
include/linux/init_task.h +3 -0
@@ -56,6 +56,8 @@ .siglock = SPIN_LOCK_UNLOCKED, \ } +extern struct group_info init_groups; +/* * INIT_TASK is used to set up the first task table, touch at * your own risk!. Base=0, limit=0x1fffff (=2MB)
@@ -87,6 +89,7 @@ .real_timer = { \ .function = it_real_fn \ }, \ + .group_info = &init_groups, \ .cap_effective = CAP_INIT_EFF_SET, \ .cap_inheritable = CAP_INIT_INH_SET, \ .cap_permitted = CAP_FULL_SET, \
===== include/linux/limits.h 1.3 vs edited =====
include/linux/limits.h +0 -1
@@ -3,7 +3,6 @@#define NR_OPEN 1024 -#define NGROUPS_MAX 32/* supplemental group IDs are available */ #define ARG_MAX 131072/* # bytes of args + environ for exec() */ #define CHILD_MAX 999/* no limit :-) */ #define OPEN_MAX 256/* # open files a process may have */
===== kernel/sys.c 1.69 vs edited =====
kernel/sys.c +173 -30
250 lines not on this page · raw message
===== kernel/fork.c 1.154 vs edited =====
kernel/fork.c +3 -0
@@ -86,6 +86,7 @@security_task_free (tsk);free_uid (tsk->user); +put_group_info (tsk->group_info);free_task (tsk); }
@@ -878,6 +879,7 @@atomic_inc (&p->user->__count);atomic_inc (&p->user->processes); +get_group_info (p->group_info);/* * If multiple threads are within copy_process(), then this check
@@ -1084,6 +1086,7 @@ bad_fork_cleanup_put_domain:module_put (p->thread_info->exec_domain->module); bad_fork_cleanup_count: +put_group_info (p->group_info);atomic_dec (&p->user->processes);free_uid (p->user); bad_fork_free:
===== kernel/uid16.c 1.5 vs edited =====
kernel/uid16.c +59 -21
103 lines not on this page · raw message
===== fs/proc/array.c 1.55 vs edited =====
fs/proc/array.c +2 -2
@@ -176,8 +176,8 @@ p->files ? p->files->max_fds : 0);task_unlock (p); -for (g =0 ; g < p->ngroups; g++) - buffer +=sprintf (buffer,"%d " , p->groups[g]); +for (g =0 ; g <min (p->group_info->ngroups,NGROUPS_SMALL ); g++) + buffer +=sprintf (buffer,"%d " ,GROUP_AT (p->group_info,g)); buffer +=sprintf (buffer,"\n" );return buffer;
===== include/linux/sunrpc/auth.h 1.9 vs edited =====
include/linux/sunrpc/auth.h +1 -2
@@ -28,8 +28,7 @@struct auth_cred {uid_t uid;gid_t gid; -int ngroups; -gid_t *groups; +struct group_info *group_info; };/*
===== include/linux/sunrpc/svcauth.h 1.9 vs edited =====
include/linux/sunrpc/svcauth.h +2 -1
@@ -16,10 +16,11 @@#include <linux/sunrpc/cache.h> #include <linux/hash.h> +#define SVC_CRED_NGROUPS 32struct svc_cred {uid_t cr_uid;gid_t cr_gid; -gid_t cr_groups[NGROUPS ]; +gid_t cr_groups[SVC_CRED_NGROUPS ]; };struct svc_rqst ;/* forward decl */
===== net/sunrpc/auth.c 1.12 vs edited =====
net/sunrpc/auth.c +2 -4
@@ -249,8 +249,7 @@struct auth_cred acred = { .uid = current->fsuid, .gid = current->fsgid, - .ngroups = current->ngroups, - .groups = current->groups, + .group_info = current->group_info, };dprintk ("RPC: looking up %s cred\n" , auth->au_ops->au_name);
@@ -264,8 +263,7 @@struct auth_cred acred = { .uid = current->fsuid, .gid = current->fsgid, - .ngroups = current->ngroups, - .groups = current->groups, + .group_info = current->group_info, }; dprintk("RPC: %4d looking up %s cred\n",
===== net/sunrpc/auth_unix.c 1.11 vs edited =====
net/sunrpc/auth_unix.c +4 -4
@@ -82,7 +82,7 @@ cred->uc_gid = cred->uc_pgid =0 ; cred->uc_gids[0 ] =NOGROUP ; }else { -int groups = acred->ngroups; +int groups = acred->group_info->ngroups;if (groups >NFS_NGROUPS ) groups =NFS_NGROUPS ;
@@ -91,7 +91,7 @@ cred->uc_puid = current->uid; cred->uc_pgid = current->gid;for (i =0 ; i < groups; i++) - cred->uc_gids[i] = (gid_t ) acred->groups[i]; + cred->uc_gids[i] =GROUP_AT (acred->group_info, i);if (i <NFS_NGROUPS ) cred->uc_gids[i] =NOGROUP ; }
@@ -126,11 +126,11 @@ || cred->uc_pgid != current->gid)return 0 ; - groups = acred->ngroups; + groups = acred->group_info->ngroups;if (groups >NFS_NGROUPS ) groups =NFS_NGROUPS ;for (i =0 ; i < groups ; i++) -if (cred->uc_gids[i] != (gid_t ) acred->groups[i]) +if (cred->uc_gids[i] !=GROUP_AT (acred->group_info, i))return 0 ;return 1 ; }
===== net/sunrpc/svcauth_unix.c 1.20 vs edited =====
net/sunrpc/svcauth_unix.c +2 -2
@@ -434,11 +434,11 @@if (slen >16 || (len -= (slen +2 )*4 ) <0 ) goto badcred;for (i =0 ; i < slen; i++) -if (i <NGROUPS ) +if (i <SVC_CRED_NGROUPS ) cred->cr_groups[i] =ntohl (svc_getu32 (argv));else svc_getu32 (argv); -if (i <NGROUPS ) +if (i <SVC_CRED_NGROUPS ) cred->cr_groups[i] =NOGROUP ;if (svc_getu32 (argv) !=RPC_AUTH_NULL ||svc_getu32 (argv) !=0 ) {
===== fs/nfsd/auth.c 1.2 vs edited =====
fs/nfsd/auth.c +7 -4
@@ -10,12 +10,15 @@#include <linux/sunrpc/svcauth.h> #include <linux/nfsd/nfsd.h> +extern asmlinkage long sys_setgroups (int gidsetsize,gid_t *grouplist); +#define CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))void nfsd_setuser (struct svc_rqst *rqstp,struct svc_export *exp) {struct svc_cred *cred = &rqstp->rq_cred;int i; +gid_t groups[SVC_CRED_NGROUPS ];if (exp->ex_flags &NFSEXP_ALLSQUASH ) { cred->cr_uid = exp->ex_anon_uid;
@@ -26,7 +29,7 @@ cred->cr_uid = exp->ex_anon_uid;if (!cred->cr_gid) cred->cr_gid = exp->ex_anon_gid; -for (i =0 ; i <NGROUPS ; i++) +for (i =0 ; i <SVC_CRED_NGROUPS ; i++)if (!cred->cr_groups[i]) cred->cr_groups[i] = exp->ex_anon_gid; }
@@ -39,13 +42,13 @@ current->fsgid = cred->cr_gid; else current->fsgid = exp->ex_anon_gid; -for (i =0 ; i <NGROUPS ; i++) { +for (i =0 ; i <SVC_CRED_NGROUPS ; i++) {gid_t group = cred->cr_groups[i];if (group == (gid_t )NOGROUP )break ; - current->groups[i] = group; + groups[i] = group; } - current->ngroups = i; +sys_setgroups (i, groups);if ((cred->cr_uid)) {cap_t (current->cap_effective) &= ~CAP_NFSD_MASK ;
===== fs/nfsd/nfs4state.c 1.21 vs edited =====
fs/nfsd/nfs4state.c +1 -1
@@ -244,7 +244,7 @@ target->cr_uid = source->cr_uid; target->cr_gid = source->cr_gid; -for (i =0 ; i <NGROUPS ; i++) +for (i =0 ; i <SVC_CRED_NGROUPS ; i++) target->cr_groups[i] = source->cr_groups[i]; }
===== include/linux/security.h 1.28 vs edited =====
include/linux/security.h +6 -7
@@ -554,9 +554,8 @@* Return 0 if permission is granted. * @task_setgroups: * Check permission before setting the supplementary group set of the -* current process to @grouplist. -* @gidsetsize contains the number of elements in @grouplist. -* @grouplist contains the array of gids. +* current process. +* @group_info contains the new group information. * Return 0 if permission is granted. * @task_setnice: * Check permission before setting the nice value of @p to @nice.
@@ -1116,7 +1115,7 @@int (*task_setpgid) (struct task_struct * p,pid_t pgid);int (*task_getpgid) (struct task_struct * p);int (*task_getsid) (struct task_struct * p); -int (*task_setgroups) (int gidsetsize,gid_t * grouplist); +int (*task_setgroups) (struct group_info *group_info);int (*task_setnice) (struct task_struct * p,int nice);int (*task_setrlimit) (unsigned int resource,struct rlimit * new_rlim); int (*task_setscheduler) (struct task_struct * p, int policy,
@@ -1670,9 +1669,9 @@return security_ops->task_getsid (p); } -static inline int security_task_setgroups (int gidsetsize,gid_t *grouplist) +static inline int security_task_setgroups (struct group_info *group_info) { -return security_ops->task_setgroups (gidsetsize, grouplist); +return security_ops->task_setgroups (group_info); }static inline int security_task_setnice (struct task_struct *p,int nice)
@@ -2299,7 +2298,7 @@return 0 ; } -static inline int security_task_setgroups (int gidsetsize,gid_t *grouplist) +static inline int security_task_setgroups (struct group_info *group_info) {return 0 ; }
===== security/dummy.c 1.30 vs edited =====
security/dummy.c +1 -1
@@ -539,7 +539,7 @@return 0 ; } -static int dummy_task_setgroups (int gidsetsize,gid_t * grouplist) +static int dummy_task_setgroups (struct group_info *group_info) {return 0 ; }
===== arch/ia64/ia32/sys_ia32.c 1.87 vs edited =====
arch/ia64/ia32/sys_ia32.c +69 -28
113 lines not on this page · raw message
===== arch/mips/kernel/sysirix.c 1.18 vs edited =====
arch/mips/kernel/sysirix.c +1 -1
@@ -368,7 +368,7 @@ retval =HZ ; goto out;case 4 : - retval =NGROUPS ; + retval =INT_MAX ; goto out;case 5 : retval =NR_OPEN ;
===== arch/s390/kernel/compat_linux.c 1.10 vs edited =====
arch/s390/kernel/compat_linux.c +57 -16
96 lines not on this page · raw message
===== arch/sparc/kernel/sys_sunos.c 1.26 vs edited =====
arch/sparc/kernel/sys_sunos.c +1 -1
@@ -896,7 +896,7 @@ ret =HZ ;break ;case _SC_NGROUPS_MAX: - ret =NGROUPS_MAX ; + ret =INT_MAX ;break ;case _SC_OPEN_MAX: ret =OPEN_MAX ;
===== arch/sparc64/kernel/sys_sparc32.c 1.86 vs edited =====
arch/sparc64/kernel/sys_sparc32.c +57 -16
96 lines not on this page · raw message
===== arch/sparc64/kernel/sys_sunos32.c 1.35 vs edited =====
arch/sparc64/kernel/sys_sunos32.c +1 -1
@@ -859,7 +859,7 @@ ret =HZ ;break ;case _SC_NGROUPS_MAX: - ret =NGROUPS_MAX ; + ret =INT_MAX ;break ;case _SC_OPEN_MAX: ret =OPEN_MAX ;
===== arch/sparc64/solaris/misc.c 1.20 vs edited =====
arch/sparc64/solaris/misc.c +1 -1
@@ -341,7 +341,7 @@ asmlinkage int solaris_sysconf(int id) {switch (id) { -case SOLARIS_CONFIG_NGROUPS :return NGROUPS_MAX ; +case SOLARIS_CONFIG_NGROUPS :return INT_MAX ;case SOLARIS_CONFIG_CHILD_MAX :return CHILD_MAX ;case SOLARIS_CONFIG_OPEN_FILES :return OPEN_MAX ;case SOLARIS_CONFIG_POSIX_VER :return 199309 ;
===== include/asm-alpha/param.h 1.2 vs edited =====
include/asm-alpha/param.h +0 -4
@@ -19,10 +19,6 @@#define EXEC_PAGESIZE 8192 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-arm/param.h 1.5 vs edited =====
include/asm-arm/param.h +0 -4
@@ -26,10 +26,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-arm26/param.h 1.1 vs edited =====
include/asm-arm26/param.h +0 -4
@@ -22,10 +22,6 @@# define HZ 100#endif -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-cris/param.h 1.2 vs edited =====
include/asm-cris/param.h +0 -4
@@ -14,10 +14,6 @@#define EXEC_PAGESIZE 8192 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-h8300/param.h 1.1 vs edited =====
include/asm-h8300/param.h +0 -4
@@ -14,10 +14,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-i386/param.h 1.2 vs edited =====
include/asm-i386/param.h +0 -4
@@ -13,10 +13,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-ia64/param.h 1.5 vs edited =====
include/asm-ia64/param.h +0 -4
@@ -12,10 +12,6 @@#define EXEC_PAGESIZE 65536 -#ifndef NGROUPS -# define NGROUPS 32 -#endif -#ifndef NOGROUP # define NOGROUP (-1)#endif
===== include/asm-m68k/param.h 1.2 vs edited =====
include/asm-m68k/param.h +0 -4
@@ -13,10 +13,6 @@#define EXEC_PAGESIZE 8192 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-m68knommu/param.h 1.1 vs edited =====
include/asm-m68knommu/param.h +0 -4
@@ -44,10 +44,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-mips/param.h 1.3 vs edited =====
include/asm-mips/param.h +0 -4
@@ -33,10 +33,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-parisc/param.h 1.3 vs edited =====
include/asm-parisc/param.h +0 -4
@@ -18,10 +18,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-ppc/param.h 1.6 vs edited =====
include/asm-ppc/param.h +0 -4
@@ -13,10 +13,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-ppc64/param.h 1.2 vs edited =====
include/asm-ppc64/param.h +0 -4
@@ -20,10 +20,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-s390/param.h 1.3 vs edited =====
include/asm-s390/param.h +0 -4
@@ -21,10 +21,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-sh/param.h 1.2 vs edited =====
include/asm-sh/param.h +0 -4
@@ -17,10 +17,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-sparc/param.h 1.2 vs edited =====
include/asm-sparc/param.h +0 -4
@@ -14,10 +14,6 @@#define EXEC_PAGESIZE 8192/* Thanks for sun4's we carry baggage... */ -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-sparc64/param.h 1.2 vs edited =====
include/asm-sparc64/param.h +0 -4
@@ -14,10 +14,6 @@#define EXEC_PAGESIZE 8192/* Thanks for sun4's we carry baggage... */ -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-um/param.h 1.1 vs edited =====
include/asm-um/param.h +0 -4
@@ -3,10 +3,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-v850/param.h 1.1 vs edited =====
include/asm-v850/param.h +0 -4
@@ -18,10 +18,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
===== include/asm-x86_64/param.h 1.3 vs edited =====
include/asm-x86_64/param.h +0 -4
@@ -13,10 +13,6 @@#define EXEC_PAGESIZE 4096 -#ifndef NGROUPS -#define NGROUPS 32 -#endif -#ifndef NOGROUP #define NOGROUP (-1)#endif
Quoted 1 line · Tim Hockin
What think? Can we get rid of this limit at long last? :)
Aren't the Samba folks asking for this as well? People using Samba v3 to replace NT4 domains where commonly users belong to many more than 32 groups.
Dax
Quoted 1 line · * Tim Hockin ([email protected]) wrote:
This patch changes the security interface for
task_setgroups().
Minor fixup would be needed for SELinux.
thanks,
-chris
Signature · 14 lines
Linux Security Modules http://lsm.immunix.org http://lsm.bkbits.net
===== security/selinux/hooks.c 1.20 vs edited =====
--- 1.20/security/selinux/hooks.c Tue Jan 20 17:58:48 2004
+++ edited/security/selinux/hooks.c Tue Jan 27 15:42:41 2004
@@ -2265,7 +2265,7 @@
return task_has_perm(current, p, PROCESS__GETSESSION);
}
-static int selinux_task_setgroups(int gidsetsize, gid_t *grouplist)
+static int selinux_task_setgroups(struct group_info *group_info)
{
/* See the comment for setuid above. */
return 0;Quoted 17 lines · * Tim Hockin ([email protected]) wrote:
kernel/sys.c +17
-0+/* validate and set current->group_info */ +int set_current_groups (struct group_info *info) +{ +int retval; +struct group_info *old_info; + + retval =security_task_setgroups (info); +if (retval) +return retval; + +groups_sort (info); + old_info = current->group_info; + current->group_info = info; +put_group_info (old_info); + +return 0 ; +}
<snip>
Quoted 4 lines
=====
fs/proc/array.c1.55 vs edited =====
fs/proc/array.c line 183
Quoted 10 lines
fs/proc/array.c +2
-2@@ -176,8 +176,8 @@ p->files ? p->files->max_fds : 0);task_unlock (p); -for (g =0 ; g < p->ngroups; g++) - buffer +=sprintf (buffer,"%d " , p->groups[g]); +for (g =0 ; g <min (p->group_info->ngroups,NGROUPS_SMALL ); g++) + buffer +=sprintf (buffer,"%d " ,GROUP_AT (p->group_info,g)); buffer +=sprintf (buffer,"\n" );return buffer;
this seems racy with no get/put?
thanks,
-chris
Signature · 1 line
Linux Security Modules http://lsm.immunix.org http://lsm.bkbits.net
Quoted 2 lines · Tim Hockin
Attached is a patch to remove the NGROUPS limit (again).
+/* export the group_info to a user-space array */
+static int groups_to_user(gid_t *grouplist, struct group_info __user *info) +{
+ int i;
+ int count = info->ngroups;
+
+ for (i = 0; i < info->nblocks; i++) {
+ int cp_count = min(NGROUPS_BLOCK, count);
+ int off = i * NGROUPS_BLOCK;
+ int len = cp_count * sizeof(*grouplist);
+
+ if (copy_to_user(grouplist+off, info->blocks[i], len))
+ return -EFAULT;
+
This had me thorougly confused for a while ;) The __user tag here should apply to grouplist, not to info.
+static int groups16_to_user(old_gid_t __user *grouplist,
+ struct group_info *info)
+{
+ int i;
+ old_gid_t group;
+
+ if (info->ngroups > TASK_SIZE/sizeof(group))
+ return -EFAULT;
+ if (!access_ok(VERIFY_WRITE, grouplist, info->ngroups * sizeof(group)))
+ return -EFAULT;
Why are many functions playing with TASK_SIZE?
fs/nfsd/auth.c +2 -0
@@ -10,12 +10,15 @@#include <linux/sunrpc/svcauth.h> #include <linux/nfsd/nfsd.h> +extern asmlinkage long sys_setgroups (int gidsetsize,gid_t *grouplist); +
rant. We have soooo many syscalls declared in .c files. We had a bug due to this a while back. Problem is, we have no anointed header in which to place them. include/linux/syscalls.h would suit. And unistd.h for arch-specific syscalls. But that's not appropriate to this patch.
Quoted 4 lines · Andrew Morton
rant. We have soooo many syscalls declared in .c files. We had a bug due to this a while back. Problem is, we have no anointed header in which to place them.
include/linux/syscalls.hwould suit. Andunistd.hfor arch-specific syscalls. But that's not appropriate to this patch.
I did that in the linux-abi patch for 2.4 and even submitted it a few times before 2.5 forked, but Linus didn't seem to like it.
Quoted 6 lines · Andrew Morton
Quoted 1 line
Attached is a patch to remove the NGROUPS limit (again).
(quoted diff) +2
-0+/* export the group_info to a user-space array */ +static int groups_to_user(gid_t *grouplist, struct group_info __user *info)This had me thorougly confused for a while ;) The
__usertag here should apply to grouplist, not to info.
indeed.
Quoted 11 lines
(quoted diff) +10
-0+static int groups16_to_user(old_gid_t __user *grouplist, + struct group_info *info) +{ + int i; + old_gid_t group; + + if (info->ngroups > TASK_SIZE/sizeof(group)) + return -EFAULT; + if (!access_ok(VERIFY_WRITE, grouplist, info->ngroups * sizeof(group))) + return -EFAULT;
Quoted 1 line
Why are many functions playing with
TASK_SIZE?
Not sure - I thought it was maybe a paranoid check, Rusty included it in his version of a similar patch a while ago.
Quoted 6 lines
+extern asmlinkage long
sys_setgroups(int gidsetsize, gid_t *grouplist);rant. We have soooo many syscalls declared in .c files. We had a bug due to this a while back. Problem is, we have no anointed header in which to place them.
include/linux/syscalls.hwould suit. Andunistd.hfor arch-specific syscalls. But that's not appropriate to this patch.
Agreed.
Quoted 11 lines · Tim Hockin
Quoted 7 lines · Andrew Morton
(quoted diff) +5
-0+ + if (info->ngroups > TASK_SIZE/sizeof(group)) + return -EFAULT; + if (!access_ok(VERIFY_WRITE, grouplist, info->ngroups * sizeof(group))) + return -EFAULT;Why are many functions playing with
TASK_SIZE?Not sure - I thought it was maybe a paranoid check, Rusty included it in his version of a similar patch a while ago.
Yes, a necessary paranoid check: without it, info->ngroups * sizeof(group) can easily wrap to something small, and access_ok pass when it should fail.
Hugh
Quoted 8 lines · Hugh Dickins
Quoted 7 lines · Tim Hockin
Quoted 6 lines · Andrew Morton
(quoted diff) +5
-0+ + if (info->ngroups > TASK_SIZE/sizeof(group)) + return -EFAULT; + if (!access_ok(VERIFY_WRITE, grouplist, info->ngroups * sizeof(group))) + return -EFAULT;
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Why are many functions playing with
TASK_SIZE?Not sure - I thought it was maybe a paranoid check, Rusty included it in his version of a similar patch a while ago.
Yes, a necessary paranoid check: without it,
info->ngroups* sizeof(group) can easily wrap to something small, andaccess_okpass when it should fail.
Sorry, I should have looked further. info->ngroups is an "int", so if this check is needed, a check for negativity (or unsigned cast) would also be needed. But it shouldn't be needed in the copy to user cases, and in the copy from user cases gidsetsize should be checked much earlier, in or before groups_alloc.
Hugh
Quoted 4 lines · Hugh Dickins
Sorry, I should have looked further.
info->ngroupsis an "int", so if this check is needed, a check for negativity (or unsigned cast) would also be needed.
Nope - there's an implied cast by virtue of the right side being unsigned in the comparison already.
Although I do believe that it would be better written as
#define MAXGROUPS (1000) /* Arbitrary, but we have to limit it somehere */ if ((unsigned) info->ngroups > MAXGROUPS) return -ETOOEFFINGLARGE;
as I absolutely _despise_ code that tries to be too generic.
What is it with CS classes that have removed "common sense" from the equation?
Linus
Quoted 11 lines · Linus Torvalds
Although I do believe that it would be better written as
#define MAXGROUPS (1000) /* Arbitrary, but we have to limit it somehere */ if ((unsigned) info->ngroups > MAXGROUPS) return -ETOOEFFINGLARGE;as I absolutely _despise_ code that tries to be too generic.
What is it with CS classes that have removed "common sense" from the equation?
OK, there are two easy answers to this. I can re-work it with a simple 32k limit that needs to be recompiled to change, or I can add a sysctl to control it (it appeared in an early version of this patch).
Preference?
Signature · 4 lines
Tim Hockin Sun Microsystems, Linux Software Engineering [email protected] All opinions are my own, not Sun's
Hi!
Quoted 7 lines
Quoted 7 lines
Although I do believe that it would be better written as
#define MAXGROUPS (1000) /* Arbitrary, but we have to limit it somehere */ if ((unsigned) info->ngroups > MAXGROUPS) return -ETOOEFFINGLARGE;
Quoted 8 lines
Quoted 4 lines
as I absolutely _despise_ code that tries to be too generic.
What is it with CS classes that have removed "common sense" from the equation?
OK, there are two easy answers to this. I can re-work it with a simple 32k limit that needs to be recompiled to change, or I can add a sysctl to control it (it appeared in an early version of this patch).
I guess static limit is okay for this...
Pavel
Signature · 2 lines
When do you have a heart between your knees? [Johanka's followup: and *two* hearts?]
Quoted 11 lines · Pavel Machek
Hi!
Quoted 9 lines
Quoted 9 lines
Although I do believe that it would be better written as
#define MAXGROUPS (1000) /* Arbitrary, but we have to limit it somehere */ if ((unsigned) info->ngroups > MAXGROUPS) return -ETOOEFFINGLARGE;as I absolutely _despise_ code that tries to be too generic.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
What is it with CS classes that have removed "common sense" from the equation?
OK, there are two easy answers to this. I can re-work it with a simple 32k limit that needs to be recompiled to change, or I can add a sysctl to control it (it appeared in an early version of this patch).
I guess static limit is okay for this...
Maybe static limit is enough but it's more than just a bit annoying when you hit that <limit>+1 mark. Oh well, just upping the current limit *a lot* would make life easier for some of us.
- Panu -
In message <[email protected]> you write:
Quoted 3 lines
(sorry if this dups, screwup in my aliases file)
Linus,
You should probably send to Andrew Morton, too (or instead).
For the record; it's overkill for what I need (hundreds, not thousands of groups, and I don't really mind if accessing them is slow), but at this point I'd just like *some* solution.
Thanks Tim!
Rusty.
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
On Tue, Jan 27, 2004 at 02:53:11PM -0800, Tim Hockin wrote:
For the every declaration of struct group_info *info, is there a more descriptive name than info available. This will make searchs simpler in the long run.
+#define NGROUPS_SMALL 32
+#define NGROUPS_BLOCK ((int)(EXEC_PAGESIZE / sizeof(gid_t)))
Can this be changed to NGROUPS_PER_EPAGE. NGROUPS_BLOCK seems to indicate a location of a block or the block or some block given an offset. NGROUPS_PER_EPAGE is very explicit.
+void groups_free(struct group_info *info)
{
+ if (info->ngroups > NGROUPS_SMALL) {
Why not use info->nblocks > 0. These are more clearly tied to each other than ngroups and NGROUPS_SMALL.
+ while (left >= 0 && GROUP_AT(info, left) > tmp) {
+ GROUP_AT(info, right) = GROUP_AT(info, left); + left -= stride; + right = left + stride;
For the above in groups_sort, why not just have
right = stride;
left -= stride;@@ -1102,54 +1256,43 @@
if (gidsetsize < 0)
return -EINVAL;
- i = current->ngroups;
+ i = current->group_info->ngroups;
if (gidsetsize) {
if (i > gidsetsize)
return -EINVAL;
- if (copy_to_user(grouplist, current->groups, sizeof(gid_t)*i))
+ if (groups_to_user(grouplist, current->group_info))
return -EFAULT;
}Shouldn't there be a get/put pair around this. Especially with the copy_to_user call buried in groups_to_user, we could spend quite some time waiting for the page fault and another thread could free our structure. Or maybe I am missing something...
+ if (info->ngroups > TASK_SIZE/sizeof(group))
+ return -EFAULT;
I don't understand the TASK_SIZE usage. Maybe this is a difference between ia64 and i386, but these checks don't make any sense to me. Consider them not looked at.
asmlinkage long sys_getgroups16(int gidsetsize, old_gid_t __user *grouplist) {
- old_gid_t groups[NGROUPS]; - int i,j; + int i = 0;
if (gidsetsize < 0)
return -EINVAL;
- i = current->ngroups;
+ i = current->group_info->ngroups;
if (gidsetsize) {
if (i > gidsetsize)
return -EINVAL;- for(j=0;j<i;j++)
- groups[j] = current->groups[j];
- if (copy_to_user(grouplist, groups, sizeof(old_gid_t)*i))
+ if (groups16_to_user(grouplist, current->group_info))
Again with the get/put.
===== fs/proc/array.c 1.55 vs edited =====
fs/proc/array.c Tue Jan 27 12:40:02 2004 renamed from fs/proc/array.c Tue Oct 14 14:00:09 2003 +2 -2
@@ -176,8 +176,8 @@ p->files ? p->files->max_fds : 0); task_unlock(p); - for (g = 0; g < p->ngroups; g++) - buffer += sprintf(buffer, "%d ", p->groups[g]); + for (g = 0; g < min(p->group_info->ngroups,NGROUPS_SMALL); g++) + buffer += sprintf(buffer, "%d ", GROUP_AT(p->group_info,g)); buffer += sprintf(buffer, "\n"); return buffer;
Again with the get/put.
All of the sunrpc mods appear to need get/put.