diff options
| author | Dmitry Chagin <dchagin@FreeBSD.org> | 2022-05-09 18:48:15 +0000 |
|---|---|---|
| committer | Dmitry Chagin <dchagin@FreeBSD.org> | 2022-05-09 18:48:15 +0000 |
| commit | 7b76c79b0b3aa2b769e4c6b058243ec65278f361 (patch) | |
| tree | b14815d36adcfcc02236ef6ea7b56419ce0ae5d0 | |
| parent | bfae7fbaa2af43800589b666ac45897d513f4482 (diff) | |
| download | src-7b76c79b0b3aa2b769e4c6b058243ec65278f361.tar.gz src-7b76c79b0b3aa2b769e4c6b058243ec65278f361.zip | |
linux(4): Regen for prctl fix.
MFC after: 2 weeks
| -rw-r--r-- | sys/amd64/linux32/linux32_proto.h | 2 | ||||
| -rw-r--r-- | sys/amd64/linux32/linux32_systrace_args.c | 4 | ||||
| -rw-r--r-- | sys/i386/linux/linux_proto.h | 2 | ||||
| -rw-r--r-- | 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 71b87077778f..219f0f09f8c9 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 8a9f2aeed3d2..fee5cf2c2e2d 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1162,7 +1162,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_prctl_args *p = params; iarg[a++] = p->option; /* l_int */ uarg[a++] = (intptr_t)p->arg2; /* l_uintptr_t */ - iarg[a++] = p->arg3; /* l_ulntptr_t */ + uarg[a++] = (intptr_t)p->arg3; /* l_uintptr_t */ uarg[a++] = (intptr_t)p->arg4; /* l_uintptr_t */ uarg[a++] = (intptr_t)p->arg5; /* l_uintptr_t */ *n_args = 5; @@ -5034,7 +5034,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 e0cbf9e4336a..2e243d463a13 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 717e6b5d80d2..613d1ada1b3f 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1205,7 +1205,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_prctl_args *p = params; iarg[a++] = p->option; /* l_int */ uarg[a++] = (intptr_t)p->arg2; /* l_uintptr_t */ - iarg[a++] = p->arg3; /* l_ulntptr_t */ + uarg[a++] = (intptr_t)p->arg3; /* l_uintptr_t */ uarg[a++] = (intptr_t)p->arg4; /* l_uintptr_t */ uarg[a++] = (intptr_t)p->arg5; /* l_uintptr_t */ *n_args = 5; @@ -5134,7 +5134,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"; |