Date: Fri, 17 Jun 2022 19:40:12 GMT From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 9e7d26a0ca99 - stable/13 - linux(4): Regen for prctl syscall. Message-ID: <202206171940.25HJeCBW021095@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=9e7d26a0ca99b4d2032f8e9def89a592b3e11663 commit 9e7d26a0ca99b4d2032f8e9def89a592b3e11663 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2022-06-17 19:35:05 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2022-06-17 19:35:05 +0000 linux(4): Regen for prctl syscall. MFC after: 2 weeks (cherry picked from commit e76857671873f0c9037dcc9c546b490714096c73) --- 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 a631088b7d23..fbbdbce3a96f 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 a13b468ac296..f83703960a9d 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1160,10 +1160,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 172: { struct linux_prctl_args *p = params; iarg[0] = p->option; /* l_int */ - iarg[1] = p->arg2; /* l_int */ - iarg[2] = p->arg3; /* l_int */ - iarg[3] = p->arg4; /* l_int */ - iarg[4] = p->arg5; /* l_int */ + iarg[1] = p->arg2; /* l_uintptr_t */ + iarg[2] = p->arg3; /* l_ulntptr_t */ + iarg[3] = p->arg4; /* l_uintptr_t */ + iarg[4] = p->arg5; /* l_uintptr_t */ *n_args = 5; break; } @@ -5030,16 +5030,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 dbca5ec9a28b..49a8f11dfb54 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 ae655f26842d..8e3070eeb648 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1203,10 +1203,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 172: { struct linux_prctl_args *p = params; iarg[0] = p->option; /* l_int */ - iarg[1] = p->arg2; /* l_int */ - iarg[2] = p->arg3; /* l_int */ - iarg[3] = p->arg4; /* l_int */ - iarg[4] = p->arg5; /* l_int */ + iarg[1] = p->arg2; /* l_uintptr_t */ + iarg[2] = p->arg3; /* l_ulntptr_t */ + iarg[3] = p->arg4; /* l_uintptr_t */ + iarg[4] = p->arg5; /* l_uintptr_t */ *n_args = 5; break; } @@ -5130,16 +5130,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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171940.25HJeCBW021095>