On [Fri, 07.12.2007 20:17], Lauro Ramos Venancio wrote: > The attached patch fixes a bug in getgroups and getgroups32 syscalls. > The current implementation returns error when size=0. > > According the manual: > " If size is zero, list is not modified, but the total number of > supplementary group IDs for the process is returned." > > -- > Lauro Ramos Venancio > OpenBossa Labs - Instituto Nokia de Tecnologia > Recife - Brazil
> Index: qemu-arm-eabi/linux-user/syscall.c
> ===================================================================
> --- qemu-arm-eabi.orig/linux-user/syscall.c 2007-12-07 19:59:03.000000000
> -0300
> +++ qemu-arm-eabi/linux-user/syscall.c 2007-12-07 20:01:47.000000000
> -0300
> @@ -5024,12 +5024,13 @@
> {
> int gidsetsize = arg1;
> uint16_t *target_grouplist;
> - gid_t *grouplist;
> + gid_t *grouplist = NULL;
> int i;
>
> - grouplist = alloca(gidsetsize * sizeof(gid_t));
> + if (gidsetsize)
> + grouplist = alloca(gidsetsize * sizeof(gid_t));
> ret = get_errno(getgroups(gidsetsize, grouplist));
> - if (!is_error(ret)) {
> + if (gidsetsize && !is_error(ret)) {
> target_grouplist = lock_user(VERIFY_WRITE, arg2, gidsetsize
> * 2, 0);
> if (!target_grouplist)
> goto efault;
This patch is too noisy, I think. My patch:
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ad97871..96a11a9 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5029,6 +5029,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
grouplist = alloca(gidsetsize * sizeof(gid_t));
ret = get_errno(getgroups(gidsetsize, grouplist));
+ if (gidsetsize == 0)
+ break;
if (!is_error(ret)) {
target_grouplist = lock_user(VERIFY_WRITE, arg2, gidsetsize *
2, 0);
if (!target_grouplist)
@@ -5179,6 +5181,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
grouplist = alloca(gidsetsize * sizeof(gid_t));
ret = get_errno(getgroups(gidsetsize, grouplist));
+ if (gidsetsize == 0)
+ break;
if (!is_error(ret)) {
target_grouplist = lock_user(VERIFY_WRITE, arg2, gidsetsize *
4, 0);
if (!target_grouplist) {
--
Regards, Kirill A. Shutemov
+ Belarus, Minsk
+ Velesys LLC, http://www.velesys.com/
+ ALT Linux Team, http://www.altlinux.com/
signature.asc
Description: Digital signature
