diff options
| author | Dmitry Chagin <dchagin@FreeBSD.org> | 2021-08-12 08:50:22 +0000 |
|---|---|---|
| committer | Dmitry Chagin <dchagin@FreeBSD.org> | 2021-08-12 08:50:22 +0000 |
| commit | b356030e670686df1300edf851e146c5d274e4f8 (patch) | |
| tree | 4fff55b5bf55e670a2b34457a7d5db3cc05a9cc0 /sys/i386/linux | |
| parent | 17913b0b6b707568d63559255820f3212cd31cdf (diff) | |
| download | src-b356030e670686df1300edf851e146c5d274e4f8.tar.gz src-b356030e670686df1300edf851e146c5d274e4f8.zip | |
linux(4): Regen for clone3 system call.
MFC after: 2 weeks
Diffstat (limited to 'sys/i386/linux')
| -rw-r--r-- | sys/i386/linux/linux_proto.h | 3 | ||||
| -rw-r--r-- | sys/i386/linux/linux_sysent.c | 2 | ||||
| -rw-r--r-- | sys/i386/linux/linux_systrace_args.c | 18 |
3 files changed, 20 insertions, 3 deletions
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 24b912757e61..d6e87072a89a 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -1639,7 +1639,8 @@ struct linux_pidfd_open_args { register_t dummy; }; struct linux_clone3_args { - register_t dummy; + char uargs_l_[PADL_(struct l_user_clone_args *)]; struct l_user_clone_args * uargs; char uargs_r_[PADR_(struct l_user_clone_args *)]; + char usize_l_[PADL_(l_size_t)]; l_size_t usize; char usize_r_[PADR_(l_size_t)]; }; struct linux_close_range_args { register_t dummy; diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index 5c592cd2c141..4435ef97a831 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -452,7 +452,7 @@ struct sysent linux_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)linux_fsmount, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 432 = linux_fsmount */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_fspick, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 433 = linux_fspick */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_pidfd_open, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 434 = linux_pidfd_open */ - { .sy_narg = 0, .sy_call = (sy_call_t *)linux_clone3, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 435 = linux_clone3 */ + { .sy_narg = AS(linux_clone3_args), .sy_call = (sy_call_t *)linux_clone3, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 435 = linux_clone3 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_close_range, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 436 = linux_close_range */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_openat2, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 437 = linux_openat2 */ { .sy_narg = 0, .sy_call = (sy_call_t *)linux_pidfd_getfd, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 438 = linux_pidfd_getfd */ diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 0752304d5872..baee524e5a6d 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -3205,7 +3205,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) } /* linux_clone3 */ case 435: { - *n_args = 0; + struct linux_clone3_args *p = params; + uarg[0] = (intptr_t)p->uargs; /* struct l_user_clone_args * */ + iarg[1] = p->usize; /* l_size_t */ + *n_args = 2; break; } /* linux_close_range */ @@ -8362,6 +8365,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; /* linux_clone3 */ case 435: + switch (ndx) { + case 0: + p = "userland struct l_user_clone_args *"; + break; + case 1: + p = "l_size_t"; + break; + default: + break; + }; break; /* linux_close_range */ case 436: @@ -10160,6 +10173,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 434: /* linux_clone3 */ case 435: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_close_range */ case 436: /* linux_openat2 */ |