From 9138bf01b3b21ce23cfdf15fce3f30bb9a1fbc61 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sat, 14 Jan 2006 19:22:44 +0000 Subject: Merge from trunk. --- libc/sysdeps/linux/common/setgroups.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'libc/sysdeps/linux/common/setgroups.c') diff --git a/libc/sysdeps/linux/common/setgroups.c b/libc/sysdeps/linux/common/setgroups.c index 96428edb3..49d85156f 100644 --- a/libc/sysdeps/linux/common/setgroups.c +++ b/libc/sysdeps/linux/common/setgroups.c @@ -10,6 +10,7 @@ #define sysconf __sysconf #include "syscalls.h" +#include #include #include @@ -17,23 +18,33 @@ static inline _syscall2(int, __syscall_setgroups, size_t, size, const __kernel_gid_t *, list); -int attribute_hidden __setgroups(size_t n, const gid_t * groups) +int attribute_hidden __setgroups(size_t size, const gid_t *groups) { - if (n > (size_t) sysconf(_SC_NGROUPS_MAX)) { + if (size > (size_t) sysconf(_SC_NGROUPS_MAX)) { +ret_error: __set_errno(EINVAL); return -1; } else { size_t i; - __kernel_gid_t kernel_groups[n]; + __kernel_gid_t *kernel_groups = NULL; - for (i = 0; i < n; i++) { + if (size) { + kernel_groups = (__kernel_gid_t *)malloc(sizeof(*kernel_groups) * size); + if (kernel_groups == NULL) + goto ret_error; + } + + for (i = 0; i < size; i++) { kernel_groups[i] = (groups)[i]; if (groups[i] != (gid_t) ((__kernel_gid_t) groups[i])) { - __set_errno(EINVAL); - return -1; + goto ret_error; } } - return (__syscall_setgroups(n, kernel_groups)); + + i = __syscall_setgroups(size, kernel_groups); + if (kernel_groups) + free(kernel_groups); + return i; } } strong_alias(__setgroups,setgroups) -- cgit v1.2.3