git: eb98f7791040 - main - linux(4): Regen for linux_execve
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 29 May 2023 09:18:45 UTC
The branch main has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=eb98f7791040dbb072912c19d5ae3b629e3628d4
commit eb98f7791040dbb072912c19d5ae3b629e3628d4
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-05-29 09:18:30 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2023-05-29 09:18:30 +0000
linux(4): Regen for linux_execve
MFC after: 2 month
---
sys/amd64/linux/linux_proto.h | 4 ++--
sys/amd64/linux/linux_systrace_args.c | 8 ++++----
sys/amd64/linux32/linux32_proto.h | 4 ++--
sys/amd64/linux32/linux32_systrace_args.c | 8 ++++----
sys/arm64/linux/linux_proto.h | 4 ++--
sys/arm64/linux/linux_systrace_args.c | 8 ++++----
sys/i386/linux/linux_proto.h | 4 ++--
sys/i386/linux/linux_systrace_args.c | 8 ++++----
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h
index 5fa8ec72f109..faedfd08b6c8 100644
--- a/sys/amd64/linux/linux_proto.h
+++ b/sys/amd64/linux/linux_proto.h
@@ -288,8 +288,8 @@ struct linux_vfork_args {
};
struct linux_execve_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char argp_l_[PADL_(char **)]; char ** argp; char argp_r_[PADR_(char **)];
- char envp_l_[PADL_(char **)]; char ** envp; char envp_r_[PADR_(char **)];
+ char argp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * argp; char argp_r_[PADR_(l_uintptr_t *)];
+ char envp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * envp; char envp_r_[PADR_(l_uintptr_t *)];
};
struct linux_exit_args {
char rval_l_[PADL_(l_int)]; l_int rval; char rval_r_[PADR_(l_int)];
diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c
index a4e1af26ca3d..f9d5f3c2af9e 100644
--- a/sys/amd64/linux/linux_systrace_args.c
+++ b/sys/amd64/linux/linux_systrace_args.c
@@ -531,8 +531,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 59: {
struct linux_execve_args *p = params;
uarg[a++] = (intptr_t)p->path; /* char * */
- uarg[a++] = (intptr_t)p->argp; /* char ** */
- uarg[a++] = (intptr_t)p->envp; /* char ** */
+ uarg[a++] = (intptr_t)p->argp; /* l_uintptr_t * */
+ uarg[a++] = (intptr_t)p->envp; /* l_uintptr_t * */
*n_args = 3;
break;
}
@@ -3651,10 +3651,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland char *";
break;
case 1:
- p = "userland char **";
+ p = "userland l_uintptr_t *";
break;
case 2:
- p = "userland char **";
+ p = "userland l_uintptr_t *";
break;
default:
break;
diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index 0f37367ce8dc..2ea6c867f49f 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -64,8 +64,8 @@ struct linux_unlink_args {
};
struct linux_execve_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char argp_l_[PADL_(uint32_t *)]; uint32_t * argp; char argp_r_[PADR_(uint32_t *)];
- char envp_l_[PADL_(uint32_t *)]; uint32_t * envp; char envp_r_[PADR_(uint32_t *)];
+ char argp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * argp; char argp_r_[PADR_(l_uintptr_t *)];
+ char envp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * envp; char envp_r_[PADR_(l_uintptr_t *)];
};
struct linux_chdir_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c
index 71c78673a921..cfddcc38af8e 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -95,8 +95,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 11: {
struct linux_execve_args *p = params;
uarg[a++] = (intptr_t)p->path; /* char * */
- uarg[a++] = (intptr_t)p->argp; /* uint32_t * */
- uarg[a++] = (intptr_t)p->envp; /* uint32_t * */
+ uarg[a++] = (intptr_t)p->argp; /* l_uintptr_t * */
+ uarg[a++] = (intptr_t)p->envp; /* l_uintptr_t * */
*n_args = 3;
break;
}
@@ -3400,10 +3400,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland char *";
break;
case 1:
- p = "userland uint32_t *";
+ p = "userland l_uintptr_t *";
break;
case 2:
- p = "userland uint32_t *";
+ p = "userland l_uintptr_t *";
break;
default:
break;
diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h
index e677b9f13839..951ef93c6f99 100644
--- a/sys/arm64/linux/linux_proto.h
+++ b/sys/arm64/linux/linux_proto.h
@@ -866,8 +866,8 @@ struct linux_clone_args {
};
struct linux_execve_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char argp_l_[PADL_(char **)]; char ** argp; char argp_r_[PADR_(char **)];
- char envp_l_[PADL_(char **)]; char ** envp; char envp_r_[PADR_(char **)];
+ char argp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * argp; char argp_r_[PADR_(l_uintptr_t *)];
+ char envp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * envp; char envp_r_[PADR_(l_uintptr_t *)];
};
struct linux_mmap2_args {
char addr_l_[PADL_(l_ulong)]; l_ulong addr; char addr_r_[PADR_(l_ulong)];
diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c
index 8e256e2b718a..ecc3241df319 100644
--- a/sys/arm64/linux/linux_systrace_args.c
+++ b/sys/arm64/linux/linux_systrace_args.c
@@ -1763,8 +1763,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 221: {
struct linux_execve_args *p = params;
uarg[a++] = (intptr_t)p->path; /* char * */
- uarg[a++] = (intptr_t)p->argp; /* char ** */
- uarg[a++] = (intptr_t)p->envp; /* char ** */
+ uarg[a++] = (intptr_t)p->argp; /* l_uintptr_t * */
+ uarg[a++] = (intptr_t)p->envp; /* l_uintptr_t * */
*n_args = 3;
break;
}
@@ -5285,10 +5285,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland char *";
break;
case 1:
- p = "userland char **";
+ p = "userland l_uintptr_t *";
break;
case 2:
- p = "userland char **";
+ p = "userland l_uintptr_t *";
break;
default:
break;
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 8014d7dbdcba..9541e5a9f058 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -64,8 +64,8 @@ struct linux_unlink_args {
};
struct linux_execve_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char argp_l_[PADL_(char **)]; char ** argp; char argp_r_[PADR_(char **)];
- char envp_l_[PADL_(char **)]; char ** envp; char envp_r_[PADR_(char **)];
+ char argp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * argp; char argp_r_[PADR_(l_uintptr_t *)];
+ char envp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * envp; char envp_r_[PADR_(l_uintptr_t *)];
};
struct linux_chdir_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c
index 1e5227bb20d5..ccee9b8ef94f 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -95,8 +95,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 11: {
struct linux_execve_args *p = params;
uarg[a++] = (intptr_t)p->path; /* char * */
- uarg[a++] = (intptr_t)p->argp; /* char ** */
- uarg[a++] = (intptr_t)p->envp; /* char ** */
+ uarg[a++] = (intptr_t)p->argp; /* l_uintptr_t * */
+ uarg[a++] = (intptr_t)p->envp; /* l_uintptr_t * */
*n_args = 3;
break;
}
@@ -3431,10 +3431,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland char *";
break;
case 1:
- p = "userland char **";
+ p = "userland l_uintptr_t *";
break;
case 2:
- p = "userland char **";
+ p = "userland l_uintptr_t *";
break;
default:
break;