git: 77158a5b2be8 - stable/13 - linux(4): Regen for prctl fix.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Jun 2022 19:40:17 UTC
The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=77158a5b2be87e565fcd45757c8f30e066955987 commit 77158a5b2be87e565fcd45757c8f30e066955987 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2022-06-17 19:35:11 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2022-06-17 19:35:11 +0000 linux(4): Regen for prctl fix. MFC after: 2 weeks (cherry picked from commit 7b76c79b0b3aa2b769e4c6b058243ec65278f361) --- sys/amd64/linux32/linux32_proto.h | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 4 ++-- sys/i386/linux/linux_proto.h | 2 +- sys/i386/linux/linux_systrace_args.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index fbbdbce3a96f..a03ae004ff7d 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -537,7 +537,7 @@ 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_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 arg3_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg3; char arg3_r_[PADR_(l_uintptr_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)]; }; diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index f83703960a9d..8fc22b1910b3 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1161,7 +1161,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_prctl_args *p = params; iarg[0] = p->option; /* l_int */ iarg[1] = p->arg2; /* l_uintptr_t */ - iarg[2] = p->arg3; /* l_ulntptr_t */ + iarg[2] = p->arg3; /* l_uintptr_t */ iarg[3] = p->arg4; /* l_uintptr_t */ iarg[4] = p->arg5; /* l_uintptr_t */ *n_args = 5; @@ -5033,7 +5033,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_uintptr_t"; break; case 2: - p = "l_ulntptr_t"; + p = "l_uintptr_t"; break; case 3: p = "l_uintptr_t"; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 49a8f11dfb54..f86a5a0bb136 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -538,7 +538,7 @@ 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_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 arg3_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg3; char arg3_r_[PADR_(l_uintptr_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)]; }; diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 8e3070eeb648..419c067199c0 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1204,7 +1204,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_prctl_args *p = params; iarg[0] = p->option; /* l_int */ iarg[1] = p->arg2; /* l_uintptr_t */ - iarg[2] = p->arg3; /* l_ulntptr_t */ + iarg[2] = p->arg3; /* l_uintptr_t */ iarg[3] = p->arg4; /* l_uintptr_t */ iarg[4] = p->arg5; /* l_uintptr_t */ *n_args = 5; @@ -5133,7 +5133,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_uintptr_t"; break; case 2: - p = "l_ulntptr_t"; + p = "l_uintptr_t"; break; case 3: p = "l_uintptr_t";