From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sun, 31 Aug 2025 14:40:30 +0000 (+0200)
Subject: FreeBSD syscalls: new getgroups and setgroups
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7fc1bc7c4b0c07e78504f569e6df898aaed7ba4;p=thirdparty%2Fvalgrind.git

FreeBSD syscalls: new getgroups and setgroups

Wasn't quite right for FreeBSD 15.
---

diff --git a/include/vki/vki-scnums-freebsd.h b/include/vki/vki-scnums-freebsd.h
index 50df8136a..1f2df9be4 100644
--- a/include/vki/vki-scnums-freebsd.h
+++ b/include/vki/vki-scnums-freebsd.h
@@ -130,7 +130,7 @@
 /* obs vhangup                   76 */
 /* obs vlimit                    77 */
 #define __NR_mincore             78
-#if defined(SYS_freebsd_getgroups)
+#if defined(SYS_freebsd14_getgroups)
 #define __NR_freebsd14_getgroups 79
 #else
 #define __NR_getgroups           79
@@ -643,10 +643,10 @@
 #define __NR_inotify_add_watch_at 593
 #define __NR_inotify_rm_watch    594
 
-#if defined(SYS_freebsd_getgroups)
+#if defined(SYS_freebsd14_getgroups)
 #define __NR_getgroups           595
 #endif
-#if defined(SYS_freebsd_setgroups)
+#if defined(SYS_freebsd14_setgroups)
 #define __NR_setgroups           596
 #endif
 
diff --git a/memcheck/tests/freebsd/filter_scalar b/memcheck/tests/freebsd/filter_scalar
index 5461dce87..1e4f2d753 100755
--- a/memcheck/tests/freebsd/filter_scalar
+++ b/memcheck/tests/freebsd/filter_scalar
@@ -15,6 +15,7 @@ sed '/at 0x........: syscall (in \/...libc...)/d' |
 
 sed 's/SYS_freebsd12/          SYS/' |
 sed 's/SYS_freebsd13/          SYS/' |
+sed 's/SYS_freebsd14/          SYS/' |
 
 # get rid of error limit message
 
diff --git a/memcheck/tests/freebsd/scalar.c b/memcheck/tests/freebsd/scalar.c
index c3e700f27..eeacaaf04 100644
--- a/memcheck/tests/freebsd/scalar.c
+++ b/memcheck/tests/freebsd/scalar.c
@@ -359,8 +359,8 @@ int main(void)
 
    /* SYS_freebsd14_setgroups     80 */
 #if defined(SYS_freebsd14_getgroups)
-   GO(SYS_freebsd14_getgroups, "2s 1m");
-   SY(SYS_freebsd14_getgroups, x0+1, x0+1); FAIL;
+   GO(SYS_freebsd14_setgroups, "2s 1m");
+   SY(SYS_freebsd14_setgroups, x0+1, x0+1); FAIL;
 #else
    GO(SYS_setgroups, "2s 1m");
    SY(SYS_setgroups, x0+1, x0+1); FAIL;
@@ -2575,8 +2575,8 @@ int main(void)
 
    /* SYS_setgroups               596 */
 #if defined(SYS_freebsd14_getgroups)
-   GO(SYS_getgroups, "2s 1m");
-   SY(SYS_getgroups, x0+1, x0+1); FAIL;
+   GO(SYS_setgroups, "2s 1m");
+   SY(SYS_setgroups, x0+1, x0+1); FAIL;
 #else
    FAKE_GO("596:           SYS_setgroups 2s 1m");
    FAKE_SY("Syscall param setgroups(size) contains uninitialised byte(s)\n");