i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch_thread_init_tls() now accesses user memory safely, and therefore could now

Browse Source 
fail.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19768 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-01-11 18:21:35 +00:00
parent 23bd6929dc
commit 7ed5e61cdb
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/arch/thread.h
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2004, Axel Dörfler, [email protected]. * Copyright 2002-2007, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -19,7 +19,7 @@ extern "C" {
status_t arch_thread_init(struct kernel_args *args); status_t arch_thread_init(struct kernel_args *args);
status_t arch_team_init_team_struct(struct team *t, bool kernel); status_t arch_team_init_team_struct(struct team *t, bool kernel);
status_t arch_thread_init_thread_struct(struct thread *t); status_t arch_thread_init_thread_struct(struct thread *t);
void arch_thread_init_tls(struct thread *thread); status_t arch_thread_init_tls(struct thread *thread);
void arch_thread_context_switch(struct thread *t_from, struct thread *t_to); void arch_thread_context_switch(struct thread *t_from, struct thread *t_to);
status_t arch_thread_init_kthread_stack(struct thread *t, int (*start_func)(void), void (*entry_func)(void), void (*exit_func)(void)); status_t arch_thread_init_kthread_stack(struct thread *t, int (*start_func)(void), void (*entry_func)(void), void (*exit_func)(void));
void arch_thread_dump_info(void *info); void arch_thread_dump_info(void *info);
src/system/kernel/arch/ppc/arch_thread.c
+4 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2003-2006, Haiku Inc. All rights reserved. * Copyright 2003-2007, Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -160,10 +160,11 @@ arch_thread_init_kthread_stack(struct thread *t, int (*start_func)(void),
} }
void status_t
arch_thread_init_tls(struct thread *thread) arch_thread_init_tls(struct thread *thread)
{ {
// TODO: Implement! // TODO: Implement!
return B_OK;
} }
src/system/kernel/arch/x86/arch_thread.c
+7 -5
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2005, Axel Dörfler, [email protected]. * Copyright 2002-2007, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Copyright 2001, Travis Geiselbrecht. All rights reserved. * Copyright 2001, Travis Geiselbrecht. All rights reserved.
@@ -229,17 +229,19 @@ arch_thread_init_kthread_stack(struct thread *t, int (*start_func)(void), void (
* Is called from _create_user_thread_kentry(). * Is called from _create_user_thread_kentry().
*/ */
void status_t
arch_thread_init_tls(struct thread *thread) arch_thread_init_tls(struct thread *thread)
{ {
uint32 *tls; uint32 tls[TLS_THREAD_ID_SLOT + 1];
int32 i;
thread->user_local_storage = thread->user_stack_base + thread->user_stack_size; thread->user_local_storage = thread->user_stack_base + thread->user_stack_size;
tls = (uint32 *)thread->user_local_storage;
// initialize default TLS fields
tls[TLS_BASE_ADDRESS_SLOT] = thread->user_local_storage; tls[TLS_BASE_ADDRESS_SLOT] = thread->user_local_storage;
tls[TLS_THREAD_ID_SLOT] = thread->id; tls[TLS_THREAD_ID_SLOT] = thread->id;
tls[TLS_ERRNO_SLOT] = 0;
return user_memcpy((void *)thread->user_local_storage, tls, sizeof(tls));
} }