From a896dc5ee70c20648d2c5fd8fb888e561395ae38 Mon Sep 17 00:00:00 2001 From: deraadt Date: Thu, 7 Dec 2023 14:00:15 +0000 Subject: [PATCH] sync --- sys/kern/init_sysent.c | 8 ++++---- sys/kern/syscalls.c | 6 +++--- sys/sys/syscall.h | 8 +++++--- sys/sys/syscallargs.h | 12 ++++++++++-- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index ea59de069d5..a0934eb6faa 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -1,10 +1,10 @@ -/* $OpenBSD: init_sysent.c,v 1.269 2023/11/29 20:46:23 bluhm Exp $ */ +/* $OpenBSD: init_sysent.c,v 1.270 2023/12/07 14:00:16 deraadt Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.251 2023/11/29 20:40:06 bluhm Exp + * created from; OpenBSD: syscalls.master,v 1.252 2023/12/07 13:59:04 deraadt Exp */ #include @@ -353,8 +353,8 @@ const struct sysent sysent[] = { sys_nosys }, /* 156 = obsolete ogetdirentries */ { 0, 0, 0, sys_nosys }, /* 157 = obsolete statfs25 */ - { 0, 0, 0, - sys_nosys }, /* 158 = obsolete fstatfs25 */ + { 4, s(struct sys_pinsyscalls_args), 0, + sys_pinsyscalls }, /* 158 = pinsyscalls */ { 2, s(struct sys_mimmutable_args), 0, sys_mimmutable }, /* 159 = mimmutable */ { 4, s(struct sys_waitid_args), 0, diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 3d6ff51e24f..e3d56d1c419 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -1,10 +1,10 @@ -/* $OpenBSD: syscalls.c,v 1.267 2023/11/29 20:46:23 bluhm Exp $ */ +/* $OpenBSD: syscalls.c,v 1.268 2023/12/07 14:00:16 deraadt Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.251 2023/11/29 20:40:06 bluhm Exp + * created from; OpenBSD: syscalls.master,v 1.252 2023/12/07 13:59:04 deraadt Exp */ const char *const syscallnames[] = { @@ -182,7 +182,7 @@ const char *const syscallnames[] = { #endif "#156 (obsolete ogetdirentries)", /* 156 = obsolete ogetdirentries */ "#157 (obsolete statfs25)", /* 157 = obsolete statfs25 */ - "#158 (obsolete fstatfs25)", /* 158 = obsolete fstatfs25 */ + "pinsyscalls", /* 158 = pinsyscalls */ "mimmutable", /* 159 = mimmutable */ "waitid", /* 160 = waitid */ "getfh", /* 161 = getfh */ diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 005720f139d..b17f1abb6c6 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscall.h,v 1.266 2023/11/29 20:46:24 bluhm Exp $ */ +/* $OpenBSD: syscall.h,v 1.267 2023/12/07 14:00:15 deraadt Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.251 2023/11/29 20:40:06 bluhm Exp + * created from; OpenBSD: syscalls.master,v 1.252 2023/12/07 13:59:04 deraadt Exp */ /* syscall: "syscall" ret: "int" args: "int" "..." */ @@ -446,7 +446,9 @@ /* 156 is obsolete ogetdirentries */ /* 157 is obsolete statfs25 */ - /* 158 is obsolete fstatfs25 */ +/* syscall: "pinsyscalls" ret: "int" args: "void *" "size_t" "void *" "size_t" */ +#define SYS_pinsyscalls 158 + /* syscall: "mimmutable" ret: "int" args: "void *" "size_t" */ #define SYS_mimmutable 159 diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h index dc4bce08907..7cac6ea52a5 100644 --- a/sys/sys/syscallargs.h +++ b/sys/sys/syscallargs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscallargs.h,v 1.269 2023/11/29 20:46:24 bluhm Exp $ */ +/* $OpenBSD: syscallargs.h,v 1.270 2023/12/07 14:00:15 deraadt Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.251 2023/11/29 20:40:06 bluhm Exp + * created from; OpenBSD: syscalls.master,v 1.252 2023/12/07 13:59:04 deraadt Exp */ #ifdef syscallarg @@ -750,6 +750,13 @@ struct sys_nfssvc_args { syscallarg(void *) argp; }; +struct sys_pinsyscalls_args { + syscallarg(void *) base; + syscallarg(size_t) len; + syscallarg(void *) pins; + syscallarg(size_t) pinslen; +}; + struct sys_mimmutable_args { syscallarg(void *) addr; syscallarg(size_t) len; @@ -1310,6 +1317,7 @@ int sys_ypconnect(struct proc *, void *, register_t *); int sys_nfssvc(struct proc *, void *, register_t *); #else #endif +int sys_pinsyscalls(struct proc *, void *, register_t *); int sys_mimmutable(struct proc *, void *, register_t *); int sys_waitid(struct proc *, void *, register_t *); int sys_getfh(struct proc *, void *, register_t *); -- 2.20.1