From 697966641bc56a6d2efda6b6996e4f02ae5567c1 Mon Sep 17 00:00:00 2001 From: deraadt Date: Thu, 16 Feb 2023 04:42:27 +0000 Subject: [PATCH] sync --- sys/kern/init_sysent.c | 8 ++++---- sys/kern/syscalls.c | 6 +++--- sys/sys/syscall.h | 8 +++++--- sys/sys/syscallargs.h | 11 +++++++++-- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 5622ea0b686..fa19228b1ee 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -1,10 +1,10 @@ -/* $OpenBSD: init_sysent.c,v 1.260 2023/02/14 08:35:20 mvs Exp $ */ +/* $OpenBSD: init_sysent.c,v 1.261 2023/02/16 04:42:27 deraadt Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.243 2023/02/14 08:34:49 mvs Exp + * created from; OpenBSD: syscalls.master,v 1.244 2023/02/16 04:42:06 deraadt Exp */ #include @@ -324,8 +324,8 @@ const struct sysent sysent[] = { sys_nosys }, /* 144 = obsolete ogetrlimit */ { 0, 0, 0, sys_nosys }, /* 145 = obsolete osetrlimit */ - { 0, 0, 0, - sys_nosys }, /* 146 = obsolete okillpg */ + { 3, s(struct sys_pinsyscall_args), SY_NOLOCK | 0, + sys_pinsyscall }, /* 146 = pinsyscall */ { 0, 0, 0, sys_setsid }, /* 147 = setsid */ { 4, s(struct sys_quotactl_args), 0, diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 34fdeaec96d..64f0331d0c6 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -1,10 +1,10 @@ -/* $OpenBSD: syscalls.c,v 1.258 2023/02/14 08:35:20 mvs Exp $ */ +/* $OpenBSD: syscalls.c,v 1.259 2023/02/16 04:42:27 deraadt Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.243 2023/02/14 08:34:49 mvs Exp + * created from; OpenBSD: syscalls.master,v 1.244 2023/02/16 04:42:06 deraadt Exp */ const char *const syscallnames[] = { @@ -166,7 +166,7 @@ const char *const syscallnames[] = { "setthrname", /* 143 = setthrname */ "#144 (obsolete ogetrlimit)", /* 144 = obsolete ogetrlimit */ "#145 (obsolete osetrlimit)", /* 145 = obsolete osetrlimit */ - "#146 (obsolete okillpg)", /* 146 = obsolete okillpg */ + "pinsyscall", /* 146 = pinsyscall */ "setsid", /* 147 = setsid */ "quotactl", /* 148 = quotactl */ "#149 (obsolete oquota)", /* 149 = obsolete oquota */ diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index f4036229ffb..30b1d9d4ce4 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscall.h,v 1.257 2023/02/14 08:35:20 mvs Exp $ */ +/* $OpenBSD: syscall.h,v 1.258 2023/02/16 04:42:27 deraadt Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.243 2023/02/14 08:34:49 mvs Exp + * created from; OpenBSD: syscalls.master,v 1.244 2023/02/16 04:42:06 deraadt Exp */ /* syscall: "syscall" ret: "int" args: "int" "..." */ @@ -428,7 +428,9 @@ /* 144 is obsolete ogetrlimit */ /* 145 is obsolete osetrlimit */ - /* 146 is obsolete okillpg */ +/* syscall: "pinsyscall" ret: "int" args: "int" "void *" "size_t" */ +#define SYS_pinsyscall 146 + /* syscall: "setsid" ret: "int" args: */ #define SYS_setsid 147 diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h index dc78097f7e4..d8b53eca401 100644 --- a/sys/sys/syscallargs.h +++ b/sys/sys/syscallargs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscallargs.h,v 1.260 2023/02/14 08:35:20 mvs Exp $ */ +/* $OpenBSD: syscallargs.h,v 1.261 2023/02/16 04:42:27 deraadt Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.243 2023/02/14 08:34:49 mvs Exp + * created from; OpenBSD: syscalls.master,v 1.244 2023/02/16 04:42:06 deraadt Exp */ #ifdef syscallarg @@ -728,6 +728,12 @@ struct sys_setthrname_args { syscallarg(const char *) name; }; +struct sys_pinsyscall_args { + syscallarg(int) syscall; + syscallarg(void *) addr; + syscallarg(size_t) len; +}; + struct sys_quotactl_args { syscallarg(const char *) path; syscallarg(int) cmd; @@ -1292,6 +1298,7 @@ int sys_adjtime(struct proc *, void *, register_t *); int sys_getlogin_r(struct proc *, void *, register_t *); int sys_getthrname(struct proc *, void *, register_t *); int sys_setthrname(struct proc *, void *, register_t *); +int sys_pinsyscall(struct proc *, void *, register_t *); int sys_setsid(struct proc *, void *, register_t *); int sys_quotactl(struct proc *, void *, register_t *); int sys_ypconnect(struct proc *, void *, register_t *); -- 2.20.1