Add argument support for msyscall, pledge, unveil, __realpath,

ypconnect, and __tmpfd.  Reorder several other syscalls to match
the order in syscalls.master

ok deraadt@

diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index e190b0f..03b9368 100644 (file)
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kdump.c,v 1.151 2022/12/19 22:55:12 guenther Exp $    */
+/*     $OpenBSD: kdump.c,v 1.152 2022/12/20 21:44:19 guenther Exp $    */
 
 /*-
  * Copyright (c) 1988, 1993
@@ -726,8 +726,6 @@ static const formatter scargs[][8] = {
     [SYS_ptrace]       = { Ptracedecode, Ppid_t, Pptr, Pdecint },
     [SYS_recvmsg]      = { Pfd, Pptr, Sendrecvflagsname },
     [SYS_sendmsg]      = { Pfd, Pptr, Sendrecvflagsname },
-    [SYS_recvmmsg]     = { Pfd, Pptr, Pucount, Sendrecvflagsname, Pptr },
-    [SYS_sendmmsg]     = { Pfd, Pptr, Pucount, Sendrecvflagsname },
     [SYS_recvfrom]     = { Pfd, Pptr, Pbigsize, Sendrecvflagsname },
     [SYS_accept]       = { Pfd, Pptr, Pptr },
     [SYS_getpeername]  = { Pfd, Pptr, Pptr },
@@ -735,7 +733,7 @@ static const formatter scargs[][8] = {
     [SYS_access]       = { Ppath, Accessmodename },
     [SYS_chflags]      = { Ppath, Chflagsname },
     [SYS_fchflags]     = { Pfd, Chflagsname },
-    [SYS_kill]         = { Ppgid, Signame },
+    [SYS_msyscall]     = { Pptr, Pbigsize },
     [SYS_stat]         = { Ppath, Pptr },
     [SYS_lstat]                = { Ppath, Pptr },
     [SYS_dup]          = { Pfd },
@@ -744,7 +742,7 @@ static const formatter scargs[][8] = {
     [SYS_ktrace]       = { Ppath, Ktraceopname, Ktracefacname, Ppgid },
     [SYS_sigaction]    = { Signame, Pptr, Pptr },
     [SYS_sigprocmask]  = { Sigprocmaskhowname, Sigset },
-    [SYS_getlogin_r]   = { Pptr, Psize },
+    [SYS_mmap]         = { Pptr, Pbigsize, Mmapprotname, Mmapflagsname, Pfd, Poff_t, END64 },
     [SYS_setlogin]     = { Pptr },
     [SYS_acct]         = { Ppath },
     [SYS_fstat]                = { Pfd, Pptr },
@@ -771,14 +769,14 @@ static const formatter scargs[][8] = {
     [SYS_madvise]      = { Pptr, Pbigsize, Madvisebehavname },
     [SYS_utimes]       = { Ppath, Pptr },
     [SYS_futimes]      = { Pfd, Pptr },
-    [SYS_kbind]                = { Pptr, Psize, Phexlonglong },
+    [SYS_mquery]       = { Pptr, Pbigsize, Mmapprotname, Mmapflagsname, Pfd, Poff_t, END64 },
     [SYS_getgroups]    = { Pcount, Pptr },
     [SYS_setgroups]    = { Pcount, Pptr },
     [SYS_setpgid]      = { Ppid_t, Ppid_t },
     [SYS_futex]                = { Pptr, Futexflagname, Pcount, Pptr, Pptr },
-    [SYS_sendsyslog]   = { Pptr, Psize, Syslogflagname },
     [SYS_utimensat]    = { Atfd, Ppath, Pptr, Atflagsname },
     [SYS_futimens]     = { Pfd, Pptr },
+    [SYS_kbind]                = { Pptr, Psize, Phexlonglong },
     [SYS_clock_gettime]        = { Clockname, Pptr },
     [SYS_clock_settime]        = { Clockname, Pptr },
     [SYS_clock_getres] = { Clockname, Pptr },
@@ -800,13 +798,20 @@ static const formatter scargs[][8] = {
     [SYS_setsockopt]   = { Pfd, PASS_TWO, Sockoptlevelname, Pptr, Pdecint },
     [SYS_listen]       = { Pfd, Pdecint },
     [SYS_chflagsat]    = { Atfd, Ppath, Chflagsname, Atflagsname },
+    [SYS_pledge]       = { Pptr, Pptr },
     [SYS_ppoll]                = { Pptr, Pucount, Pptr, Pptr },
     [SYS_pselect]      = { Pcount, Pptr, Pptr, Pptr, Pptr, Pptr },
     [SYS_sigsuspend]   = { Sigset },
+    [SYS_sendsyslog]   = { Pptr, Psize, Syslogflagname },
+    [SYS_unveil]       = { Ppath, Pptr },
+    [SYS___realpath]   = { Ppath, Pptr },
+    [SYS_recvmmsg]     = { Pfd, Pptr, Pucount, Sendrecvflagsname, Pptr },
+    [SYS_sendmmsg]     = { Pfd, Pptr, Pucount, Sendrecvflagsname },
     [SYS_getsockopt]   = { Pfd, PASS_TWO, Sockoptlevelname, Pptr, Pptr },
     [SYS_thrkill]      = { Ppid_t, Signame, Pptr },
     [SYS_readv]                = { Pfd, Pptr, Pcount },
     [SYS_writev]       = { Pfd, Pptr, Pcount },
+    [SYS_kill]         = { Ppgid, Signame },
     [SYS_fchown]       = { Pfd, Uidname, Gidname },
     [SYS_fchmod]       = { Pfd, Modename },
     [SYS_setreuid]     = { Uidname, Uidname },
@@ -820,14 +825,22 @@ static const formatter scargs[][8] = {
     [SYS_mkdir]                = { Ppath, Modename },
     [SYS_rmdir]                = { Ppath },
     [SYS_adjtime]      = { Pptr, Pptr },
+    [SYS_getlogin_r]   = { Pptr, Psize },
     [SYS_quotactl]     = { Ppath, Quotactlname, Uidname, Pptr },
+    [SYS_ypconnect]    = { Socktypename },
     [SYS_nfssvc]       = { Phexint, Pptr },
     [SYS_mimmutable]   = { Pptr, Pbigsize },
     [SYS_waitid]       = { PASS_TWO, Idtypeandid, Pptr, Waitidoptname },
     [SYS_getfh]                = { Ppath, Pptr },
+    [SYS___tmpfd]      = { Openflagsname },
     [SYS_sysarch]      = { Pdecint, Pptr },
+    [SYS_lseek]                = { Pfd, Poff_t, Whencename, END64 },
+    [SYS_truncate]     = { Ppath, Poff_t, END64 },
+    [SYS_ftruncate]    = { Pfd, Poff_t, END64 },
     [SYS_pread]                = { Pfd, Pptr, Pbigsize, Poff_t, END64 },
     [SYS_pwrite]        = { Pfd, Pptr, Pbigsize, Poff_t, END64 },
+    [SYS_preadv]       = { Pfd, Pptr, Pcount, Poff_t, END64 },
+    [SYS_pwritev]      = { Pfd, Pptr, Pcount, Poff_t, END64 },
     [SYS_setgid]       = { Gidname },
     [SYS_setegid]      = { Gidname },
     [SYS_seteuid]      = { Uidname },
@@ -836,10 +849,6 @@ static const formatter scargs[][8] = {
     [SYS_swapctl]      = { Swapctlname, Pptr, Pdecint },
     [SYS_getrlimit]    = { Rlimitname, Pptr },
     [SYS_setrlimit]    = { Rlimitname, Pptr },
-    [SYS_mmap]         = { Pptr, Pbigsize, Mmapprotname, Mmapflagsname, Pfd, Poff_t, END64 },
-    [SYS_lseek]                = { Pfd, Poff_t, Whencename, END64 },
-    [SYS_truncate]     = { Ppath, Poff_t, END64 },
-    [SYS_ftruncate]    = { Pfd, Poff_t, END64 },
     [SYS_sysctl]       = { Pptr, Pcount, Pptr, Pptr, Pptr, Psize },
     [SYS_mlock]                = { Pptr, Pbigsize },
     [SYS_munlock]      = { Pptr, Pbigsize },
@@ -858,14 +867,11 @@ static const formatter scargs[][8] = {
     [SYS_msync]                = { Pptr, Pbigsize, Msyncflagsname },
     [SYS_pipe]         = { Pptr },
     [SYS_fhopen]       = { Pptr, Openflagsname },
-    [SYS_preadv]       = { Pfd, Pptr, Pcount, Poff_t, END64 },
-    [SYS_pwritev]      = { Pfd, Pptr, Pcount, Poff_t, END64 },
     [SYS_mlockall]     = { Mlockallname },
     [SYS_getresuid]    = { Pptr, Pptr, Pptr },
     [SYS_setresuid]    = { Uidname, Uidname, Uidname },
     [SYS_getresgid]    = { Pptr, Pptr, Pptr },
     [SYS_setresgid]    = { Gidname, Gidname, Gidname },
-    [SYS_mquery]       = { Pptr, Pbigsize, Mmapprotname, Mmapflagsname, Pfd, Poff_t, END64 },
     [SYS_closefrom]    = { Pfd },
     [SYS_sigaltstack]  = { Pptr, Pptr },
     [SYS_shmget]       = { Pkey_t, Pbigsize, Semgetname },