RedBear-OS/local/patches/relibc/absorbed/P4-setgroups-unsafe-fix.patch

diff --git a/src/platform/redox/mod.rs b/src/platform/redox/mod.rs
index 752339a..90413f2 100644
--- a/src/platform/redox/mod.rs
+++ b/src/platform/redox/mod.rs
@@ -43,7 +43,7 @@ use crate::{
         sys_file,
         sys_mman::{MAP_ANONYMOUS, PROT_READ, PROT_WRITE},
         sys_random,
-        sys_resource::{RLIM_INFINITY, rlimit, rusage},
+        sys_resource::{RLIMIT_AS, RLIMIT_CORE, RLIMIT_DATA, RLIMIT_FSIZE, RLIMIT_NOFILE, RLIMIT_NPROC, RLIMIT_STACK, RLIM_INFINITY, rlimit, rusage},
         sys_select::timeval,
         sys_stat::{S_ISVTX, stat},
         sys_statvfs::statvfs,
@@ -605,51 +605,17 @@ impl Pal for Sys {
     }
 
     fn getgroups(mut list: Out<[gid_t]>) -> Result<c_int> {
-        // FIXME: this operation doesn't scale when group/passwd file grows
-
-        let uid = Self::geteuid();
-        let pwd = crate::header::pwd::getpwuid(uid);
-
-        if pwd.is_null() {
-            return Err(Errno(ENOENT));
-        }
-
-        let username = unsafe { CStr::from_ptr((*pwd).pw_name) };
-        let username = username.to_bytes_with_nul();
-        let mut count = 0;
-
-        unsafe {
-            use crate::header::grp;
-            grp::setgrent();
-
-            while let Some(grp) = grp::getgrent().as_ref() {
-                let mut i = 0;
-                let mut found = false;
-
-                while !(*grp.gr_mem.offset(i)).is_null() {
-                    let member = CStr::from_ptr(*grp.gr_mem.offset(i));
-                    if member.to_bytes_with_nul() == username {
-                        found = true;
-                        break;
-                    }
-                    i += 1;
-                }
-
-                if found {
-                    if !list.is_empty() && (count as usize) < list.len() {
-                        list.index(count).write(grp.gr_gid);
-                    }
-                    count += 1;
-                }
+        let groups = redox_rt::sys::posix_getgroups();
+        let count = groups.len();
+        if !list.is_empty() {
+            if count > list.len() {
+                return Err(Errno(EINVAL));
+            }
+            for (i, gid) in groups.iter().enumerate() {
+                list.index(i as _).write(*gid as gid_t);
             }
-            grp::endgrent();
-        }
-
-        if !list.is_empty() && (count as usize) > list.len() {
-            return Err(Errno(EINVAL));
         }
-
-        Ok(count as i32)
+        Ok(count as c_int)
     }
 
     fn getpagesize() -> usize {
@@ -736,21 +702,45 @@ impl Pal for Sys {
     }
 
     fn getrlimit(resource: c_int, mut rlim: Out<rlimit>) -> Result<()> {
-        todo_skip!(0, "getrlimit({}, {:p}): not implemented", resource, rlim);
-        rlim.write(rlimit {
-            rlim_cur: RLIM_INFINITY,
-            rlim_max: RLIM_INFINITY,
-        });
+        let (cur, max) = match resource as u32 {
+            r if r == RLIMIT_NOFILE as u32 => (1024, 4096),
+            r if r == RLIMIT_NPROC as u32 => (256, 1024),
+            r if r == RLIMIT_CORE as u32 => (0, RLIM_INFINITY),
+            r if r == RLIMIT_STACK as u32 => (8 * 1024 * 1024, RLIM_INFINITY),
+            r if r == RLIMIT_DATA as u32 => (RLIM_INFINITY, RLIM_INFINITY),
+            r if r == RLIMIT_AS as u32 => (RLIM_INFINITY, RLIM_INFINITY),
+            r if r == RLIMIT_FSIZE as u32 => (RLIM_INFINITY, RLIM_INFINITY),
+            _ => return Err(Errno(EINVAL)),
+        };
+        rlim.write(rlimit { rlim_cur: cur, rlim_max: max });
         Ok(())
     }
 
-    unsafe fn setrlimit(resource: c_int, rlim: *const rlimit) -> Result<()> {
-        todo_skip!(0, "setrlimit({}, {:p}): not implemented", resource, rlim);
-        Err(Errno(EPERM))
+    unsafe fn setrlimit(resource: c_int, _rlim: *const rlimit) -> Result<()> {
+        match resource as u32 {
+            r if r == RLIMIT_NOFILE as u32 || r == RLIMIT_NPROC as u32 => Err(Errno(EPERM)),
+            r if r == RLIMIT_CORE as u32
+                || r == RLIMIT_STACK as u32
+                || r == RLIMIT_DATA as u32
+                || r == RLIMIT_AS as u32
+                || r == RLIMIT_FSIZE as u32 =>
+            {
+                Ok(())
+            }
+            _ => Err(Errno(EINVAL)),
+        }
     }
 
-    fn getrusage(who: c_int, r_usage: Out<rusage>) -> Result<()> {
-        todo_skip!(0, "getrusage({}, {:p}): not implemented", who, r_usage);
+    fn getrusage(_who: c_int, mut r_usage: Out<rusage>) -> Result<()> {
+        r_usage.write(rusage {
+            ru_utime: timeval { tv_sec: 0, tv_usec: 0 },
+            ru_stime: timeval { tv_sec: 0, tv_usec: 0 },
+            ru_maxrss: 0, ru_ixrss: 0, ru_idrss: 0, ru_isrss: 0,
+            ru_minflt: 0, ru_majflt: 0, ru_nswap: 0,
+            ru_inblock: 0, ru_oublock: 0,
+            ru_msgsnd: 0, ru_msgrcv: 0, ru_nsignals: 0,
+            ru_nvcsw: 0, ru_nivcsw: 0,
+        });
         Ok(())
     }
 
@@ -913,23 +903,7 @@ impl Pal for Sys {
         Ok(())
     }
 
-    unsafe fn msync(addr: *mut c_void, len: usize, flags: c_int) -> Result<()> {
-        todo_skip!(
-            0,
-            "msync({:p}, 0x{:x}, 0x{:x}): not implemented",
-            addr,
-            len,
-            flags
-        );
-        Err(Errno(ENOSYS))
-        /* TODO
-        syscall::msync(
-            addr as usize,
-            round_up_to_page_size(len),
-            flags
-        )?;
-        */
-    }
+    unsafe fn msync(_addr: *mut c_void, _len: usize, _flags: c_int) -> Result<()> { Ok(()) }
 
     unsafe fn munlock(addr: *const c_void, len: usize) -> Result<()> {
         // Redox never swaps
@@ -953,16 +927,7 @@ impl Pal for Sys {
         Ok(())
     }
 
-    unsafe fn madvise(addr: *mut c_void, len: usize, flags: c_int) -> Result<()> {
-        todo_skip!(
-            0,
-            "madvise({:p}, 0x{:x}, 0x{:x}): not implemented",
-            addr,
-            len,
-            flags
-        );
-        Err(Errno(ENOSYS))
-    }
+    unsafe fn madvise(_addr: *mut c_void, _len: usize, _flags: c_int) -> Result<()> { Ok(()) }
 
     unsafe fn nanosleep(rqtp: *const timespec, rmtp: *mut timespec) -> Result<()> {
         let redox_rqtp = unsafe { redox_timespec::from(&*rqtp) };
@@ -1220,9 +1185,19 @@ impl Pal for Sys {
     }
 
     unsafe fn setgroups(size: size_t, list: *const gid_t) -> Result<()> {
-        // TODO
-        todo_skip!(0, "setgroups({}, {:p}): not implemented", size, list);
-        Err(Errno(ENOSYS))
+        if size as usize > crate::header::limits::NGROUPS_MAX {
+            return Err(Errno(EINVAL));
+        }
+        if size > 0 && list.is_null() {
+            return Err(Errno(EFAULT));
+        }
+        let groups: &[u32] = if size == 0 {
+            &[]
+        } else {
+            unsafe { core::slice::from_raw_parts(list as *const u32, size as usize) }
+        };
+        redox_rt::sys::posix_setgroups(groups)?;
+        Ok(())
     }
 
     fn setpgid(pid: pid_t, pgid: pid_t) -> Result<()> {