git: 8c57cf9d0d6b - stable/15 - Regen.
Konstantin Belousov <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.src,gmane.os.freebsd.devel.stable.scm |
|---|---|
| Message-ID | <[email protected]> |
The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8c57cf9d0d6b0918aa8d5508f91806b012b53b3a commit 8c57cf9d0d6b0918aa8d5508f91806b012b53b3a Author: Konstantin Belousov <[email protected]> AuthorDate: 2026-05-21 19:13:18 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2026-08-16 02:41:28 +0000 Regen. (cherry picked from commit 080a7fe981783590bf7f0ff39eb44dc2eecd58a2) --- lib/libsys/_libsys.h | 2 ++ lib/libsys/syscalls.map | 2 ++ sys/compat/freebsd32/freebsd32_syscall.h | 3 ++- sys/compat/freebsd32/freebsd32_syscalls.c | 1 + sys/compat/freebsd32/freebsd32_sysent.c | 1 + sys/compat/freebsd32/freebsd32_systrace_args.c | 30 ++++++++++++++++++++++++++ sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 30 ++++++++++++++++++++++++++ sys/sys/syscall.h | 3 ++- sys/sys/syscall.mk | 3 ++- sys/sys/sysproto.h | 7 ++++++ 12 files changed, 81 insertions(+), 3 deletions(-) diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h index b28d53af878a..e90f82acf0c5 100644 --- a/lib/libsys/_libsys.h +++ b/lib/libsys/_libsys.h @@ -474,6 +474,7 @@ typedef int (__sys_pdrfork_t)(int *, int, int); typedef int (__sys_pdwait_t)(int, int *, int, struct __wrusage *, struct __siginfo *); typedef int (__sys_renameat2_t)(int, const char *, int, const char *, int); typedef int (__sys_pdopenpid_t)(pid_t, int); +typedef int (__sys_pddupfd_t)(int, int, int); _Noreturn void __sys__exit(int rval); int __sys_fork(void); @@ -884,6 +885,7 @@ int __sys_pdrfork(int * fdp, int pdflags, int rfflags); int __sys_pdwait(int fd, int * status, int options, struct __wrusage * wrusage, struct __siginfo * info); int __sys_renameat2(int oldfd, const char * old, int newfd, const char * new, int flags); int __sys_pdopenpid(pid_t pid, int flags); +int __sys_pddupfd(int pd, int fd, int flags); __END_DECLS #endif /* __LIBSYS_H_ */ diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map index 5dd370103c7a..79d167d1de19 100644 --- a/lib/libsys/syscalls.map +++ b/lib/libsys/syscalls.map @@ -825,4 +825,6 @@ FBSDprivate_1.0 { __sys_renameat2; _pdopenpid; __sys_pdopenpid; + _pddupfd; + __sys_pddupfd; }; diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index d786f4cd4528..22704174e366 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -521,4 +521,5 @@ #define FREEBSD32_SYS_freebsd32_pdwait 601 #define FREEBSD32_SYS_renameat2 602 #define FREEBSD32_SYS_pdopenpid 603 -#define FREEBSD32_SYS_MAXSYSCALL 604 +#define FREEBSD32_SYS_pddupfd 604 +#define FREEBSD32_SYS_MAXSYSCALL 605 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 3a28ddeb843a..06606de6f52b 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -609,4 +609,5 @@ const char *freebsd32_syscallnames[] = { "freebsd32_pdwait", /* 601 = freebsd32_pdwait */ "renameat2", /* 602 = renameat2 */ "pdopenpid", /* 603 = pdopenpid */ + "pddupfd", /* 604 = pddupfd */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 767ea5ed7a5d..106c398b3e2b 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -671,4 +671,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(freebsd32_pdwait_args), .sy_call = (sy_call_t *)freebsd32_pdwait, .sy_auevent = AUE_PDWAIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 601 = freebsd32_pdwait */ { .sy_narg = AS(renameat2_args), .sy_call = (sy_call_t *)sys_renameat2, .sy_auevent = AUE_RENAMEAT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 602 = renameat2 */ { .sy_narg = AS(pdopenpid_args), .sy_call = (sy_call_t *)sys_pdopenpid, .sy_auevent = AUE_PDOPENPID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 603 = pdopenpid */ + { .sy_narg = AS(pddupfd_args), .sy_call = (sy_call_t *)sys_pddupfd, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 604 = pddupfd */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index b79d53bd62bb..ea5991bd019b 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3466,6 +3466,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } + /* pddupfd */ + case 604: { + struct pddupfd_args *p = params; + iarg[a++] = p->pd; /* int */ + iarg[a++] = p->fd; /* int */ + iarg[a++] = p->flags; /* int */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -9368,6 +9377,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* pddupfd */ + case 604: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -11306,6 +11331,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* pddupfd */ + case 604: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index d9c85bb928c0..2067393993f0 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -670,4 +670,5 @@ struct sysent sysent[] = { { .sy_narg = AS(pdwait_args), .sy_call = (sy_call_t *)sys_pdwait, .sy_auevent = AUE_PDWAIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 601 = pdwait */ { .sy_narg = AS(renameat2_args), .sy_call = (sy_call_t *)sys_renameat2, .sy_auevent = AUE_RENAMEAT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 602 = renameat2 */ { .sy_narg = AS(pdopenpid_args), .sy_call = (sy_call_t *)sys_pdopenpid, .sy_auevent = AUE_PDOPENPID, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 603 = pdopenpid */ + { .sy_narg = AS(pddupfd_args), .sy_call = (sy_call_t *)sys_pddupfd, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 604 = pddupfd */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 67b6ce31cb08..074de274d77e 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -609,4 +609,5 @@ const char *syscallnames[] = { "pdwait", /* 601 = pdwait */ "renameat2", /* 602 = renameat2 */ "pdopenpid", /* 603 = pdopenpid */ + "pddupfd", /* 604 = pddupfd */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index e82db22794f5..644335830ea9 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3553,6 +3553,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } + /* pddupfd */ + case 604: { + struct pddupfd_args *p = params; + iarg[a++] = p->pd; /* int */ + iarg[a++] = p->fd; /* int */ + iarg[a++] = p->flags; /* int */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -9513,6 +9522,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* pddupfd */ + case 604: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -11541,6 +11566,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* pddupfd */ + case 604: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 73666f1dad22..8246b0c16983 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -541,4 +541,5 @@ #define SYS_pdwait 601 #define SYS_renameat2 602 #define SYS_pdopenpid 603 -#define SYS_MAXSYSCALL 604 +#define SYS_pddupfd 604 +#define SYS_MAXSYSCALL 605 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 47d317e86b08..a9ec6dc53b0a 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -444,4 +444,5 @@ MIASM = \ pdrfork.o \ pdwait.o \ renameat2.o \ - pdopenpid.o + pdopenpid.o \ + pddupfd.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index a4308fe2861b..d76141f29db3 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1930,6 +1930,11 @@ struct pdopenpid_args { char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; +struct pddupfd_args { + char pd_l_[PADL_(int)]; int pd; char pd_r_[PADR_(int)]; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; int sys__exit(struct thread *, struct _exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); @@ -2340,6 +2345,7 @@ int sys_pdrfork(struct thread *, struct pdrfork_args *); int sys_pdwait(struct thread *, struct pdwait_args *); int sys_renameat2(struct thread *, struct renameat2_args *); int sys_pdopenpid(struct thread *, struct pdopenpid_args *); +int sys_pddupfd(struct thread *, struct pddupfd_args *); #ifdef COMPAT_43 @@ -3342,6 +3348,7 @@ int freebsd14_setgroups(struct thread *, struct freebsd14_setgroups_args *); #define SYS_AUE_pdwait AUE_PDWAIT #define SYS_AUE_renameat2 AUE_RENAMEAT #define SYS_AUE_pdopenpid AUE_PDOPENPID +#define SYS_AUE_pddupfd AUE_NULL #undef PAD_ #undef PADL_