Page MenuHomeFreeBSD
Files F107508713

D31473.diff
No OneTemporary
Actions

D31473.diff
View Options

diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master
--- a/sys/amd64/linux/syscalls.master
+++ b/sys/amd64/linux/syscalls.master
@@ -422,10 +422,10 @@
56 AUE_RFORK STD {
int linux_clone(
l_ulong flags,
- void *stack,
- void *parent_tidptr,
- void *child_tidptr,
- void *tls
+ l_ulong stack,
+ l_int *parent_tidptr,
+ l_int *child_tidptr,
+ l_ulong tls
);
}
57 AUE_FORK STD {
diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master
--- a/sys/amd64/linux32/syscalls.master
+++ b/sys/amd64/linux32/syscalls.master
@@ -642,11 +642,11 @@
}
120 AUE_RFORK STD {
int linux_clone(
- l_int flags,
- void *stack,
- void *parent_tidptr,
- void *tls,
- void *child_tidptr
+ l_ulong flags,
+ l_ulong stack,
+ l_int *parent_tidptr,
+ l_ulong tls,
+ l_int *child_tidptr
);
}
121 AUE_SYSCTL STD {
diff --git a/sys/arm/linux/syscalls.master b/sys/arm/linux/syscalls.master
--- a/sys/arm/linux/syscalls.master
+++ b/sys/arm/linux/syscalls.master
@@ -508,11 +508,11 @@
}
120 AUE_RFORK STD {
int linux_clone(
- l_int flags,
- void *stack,
- void *parent_tidptr,
- void *tls,
- void * child_tidptr
+ l_ulong flags,
+ l_ulong stack,
+ l_int *parent_tidptr,
+ l_ulong tls,
+ l_int *child_tidptr
);
}
121 AUE_SYSCTL STD {
diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master
--- a/sys/arm64/linux/syscalls.master
+++ b/sys/arm64/linux/syscalls.master
@@ -1316,10 +1316,10 @@
220 AUE_RFORK STD {
int linux_clone(
l_ulong flags,
- void *stack,
- void *parent_tidptr,
- void *tls,
- void *child_tidptr
+ l_ulong stack,
+ l_int *parent_tidptr,
+ l_ulong tls,
+ l_int *child_tidptr
);
}
221 AUE_EXECVE STD {
diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c
--- a/sys/compat/linux/linux_fork.c
+++ b/sys/compat/linux/linux_fork.c
@@ -205,10 +205,10 @@
* stack. This is what normal fork() does, so we just keep tf_rsp arg
* intact.
*/
- linux_set_upcall(td2, PTROUT(args->stack));
+ linux_set_upcall(td2, args->stack);
if (args->flags & LINUX_CLONE_SETTLS)
- linux_set_cloned_tls(td2, args->tls);
+ linux_set_cloned_tls(td2, PTRIN(args->tls));
/*
* If CLONE_PARENT is set, then the parent of the new process will be
@@ -253,7 +253,7 @@
return (EINVAL);
/* Threads should be created with own stack */
- if (args->stack == NULL)
+ if (PTRIN(args->stack) == NULL)
return (EINVAL);
p = td->td_proc;
@@ -290,7 +290,7 @@
KASSERT(em != NULL, ("clone_thread: emuldata not found.\n"));
if (args->flags & LINUX_CLONE_SETTLS)
- linux_set_cloned_tls(newtd, args->tls);
+ linux_set_cloned_tls(newtd, PTRIN(args->tls));
if (args->flags & LINUX_CLONE_CHILD_SETTID)
em->child_set_tid = args->child_tidptr;
@@ -304,7 +304,7 @@
cpu_thread_clean(newtd);
- linux_set_upcall(newtd, PTROUT(args->stack));
+ linux_set_upcall(newtd, args->stack);
PROC_LOCK(p);
p->p_flag |= P_HADTHREADS;
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -659,11 +659,11 @@
}
120 AUE_RFORK STD {
int linux_clone(
- l_int flags,
- void *stack,
- void *parent_tidptr,
- void *tls,
- void *child_tidptr
+ l_ulong flags,
+ l_ulong stack,
+ l_int *parent_tidptr,
+ l_ulong tls,
+ l_int *child_tidptr
);
}
121 AUE_SYSCTL STD {

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 16, 5:29 AM (19 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15820647
Default Alt Text
D31473.diff (3 KB)

Event Timeline