The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e76857671873f0c9037dcc9c546b490714096c73
commit e76857671873f0c9037dcc9c546b490714096c73 Author: Dmitry Chagin <[email protected]> AuthorDate: 2022-05-09 18:10:48 +0000 Commit: Dmitry Chagin <[email protected]> CommitDate: 2022-05-09 18:10:48 +0000 linux(4): Regen for prctl syscall. MFC after: 2 weeks --- sys/amd64/linux32/linux32_proto.h | 8 ++++---- sys/amd64/linux32/linux32_systrace_args.c | 16 ++++++++-------- sys/i386/linux/linux_proto.h | 8 ++++---- sys/i386/linux/linux_systrace_args.c | 16 ++++++++-------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 70d40d5f5767..71b87077778f 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -536,10 +536,10 @@ struct linux_getresgid16_args { }; struct linux_prctl_args { char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)]; - char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)]; - char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)]; - char arg4_l_[PADL_(l_int)]; l_int arg4; char arg4_r_[PADR_(l_int)]; - char arg5_l_[PADL_(l_int)]; l_int arg5; char arg5_r_[PADR_(l_int)]; + char arg2_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg2; char arg2_r_[PADR_(l_uintptr_t)]; + char arg3_l_[PADL_(l_ulntptr_t)]; l_ulntptr_t arg3; char arg3_r_[PADR_(l_ulntptr_t)]; + char arg4_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg4; char arg4_r_[PADR_(l_uintptr_t)]; + char arg5_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg5; char arg5_r_[PADR_(l_uintptr_t)]; }; struct linux_rt_sigreturn_args { char ucp_l_[PADL_(struct l_ucontext *)]; struct l_ucontext * ucp; char ucp_r_[PADR_(struct l_ucontext *)]; diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 0e0c4ca7f9f0..8a9f2aeed3d2 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1161,10 +1161,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 172: { struct linux_prctl_args *p = params; iarg[a++] = p->option; /* l_int */ - iarg[a++] = p->arg2; /* l_int */ - iarg[a++] = p->arg3; /* l_int */ - iarg[a++] = p->arg4; /* l_int */ - iarg[a++] = p->arg5; /* l_int */ + uarg[a++] = (intptr_t)p->arg2; /* l_uintptr_t */ + iarg[a++] = p->arg3; /* l_ulntptr_t */ + uarg[a++] = (intptr_t)p->arg4; /* l_uintptr_t */ + uarg[a++] = (intptr_t)p->arg5; /* l_uintptr_t */ *n_args = 5; break; } @@ -5031,16 +5031,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 1: - p = "l_int"; + p = "l_uintptr_t"; break; case 2: - p = "l_int"; + p = "l_ulntptr_t"; break; case 3: - p = "l_int"; + p = "l_uintptr_t"; break; case 4: - p = "l_int"; + p = "l_uintptr_t"; break; default: break; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 10b0f2e4f49e..e0cbf9e4336a 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -537,10 +537,10 @@ struct linux_getresgid16_args { }; struct linux_prctl_args { char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)]; - char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)]; - char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)]; - char arg4_l_[PADL_(l_int)]; l_int arg4; char arg4_r_[PADR_(l_int)]; - char arg5_l_[PADL_(l_int)]; l_int arg5; char arg5_r_[PADR_(l_int)]; + char arg2_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg2; char arg2_r_[PADR_(l_uintptr_t)]; + char arg3_l_[PADL_(l_ulntptr_t)]; l_ulntptr_t arg3; char arg3_r_[PADR_(l_ulntptr_t)]; + char arg4_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg4; char arg4_r_[PADR_(l_uintptr_t)]; + char arg5_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg5; char arg5_r_[PADR_(l_uintptr_t)]; }; struct linux_rt_sigreturn_args { char ucp_l_[PADL_(struct l_ucontext *)]; struct l_ucontext * ucp; char ucp_r_[PADR_(struct l_ucontext *)]; diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 1e4626dda202..717e6b5d80d2 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1204,10 +1204,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 172: { struct linux_prctl_args *p = params; iarg[a++] = p->option; /* l_int */ - iarg[a++] = p->arg2; /* l_int */ - iarg[a++] = p->arg3; /* l_int */ - iarg[a++] = p->arg4; /* l_int */ - iarg[a++] = p->arg5; /* l_int */ + uarg[a++] = (intptr_t)p->arg2; /* l_uintptr_t */ + iarg[a++] = p->arg3; /* l_ulntptr_t */ + uarg[a++] = (intptr_t)p->arg4; /* l_uintptr_t */ + uarg[a++] = (intptr_t)p->arg5; /* l_uintptr_t */ *n_args = 5; break; } @@ -5131,16 +5131,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 1: - p = "l_int"; + p = "l_uintptr_t"; break; case 2: - p = "l_int"; + p = "l_ulntptr_t"; break; case 3: - p = "l_int"; + p = "l_uintptr_t"; break; case 4: - p = "l_int"; + p = "l_uintptr_t"; break; default: break;
