gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

expand the size of kstack 12 KiB

Browse Source 
When a procfs file belonging to a process which was in PS_TRACED status
was accessed, calling kprintf() from process_procfs_request() caused
stack overrun, and x86_cpu_local_variables was destroyed.
This commit is contained in:
NAKAMURA Gou
2015-03-05 14:09:39 +09:00
parent f84b5acf79
commit fa29c34995
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/kernel/local.c
View File

@@ -19,13 +19,19 @@
#include <registers.h> #include <registers.h>
#include <string.h> #include <string.h>
#define LOCALS_SPAN (4 * PAGE_SIZE)
struct x86_cpu_local_variables *locals; struct x86_cpu_local_variables *locals;
size_t x86_cpu_local_variables_span = LOCALS_SPAN; /* for debugger */
void init_processors_local(int max_id) void init_processors_local(int max_id)
{ {
size_t size;
size = LOCALS_SPAN * max_id;
/* Is contiguous allocating adequate?? */ /* Is contiguous allocating adequate?? */
locals = ihk_mc_alloc_pages(max_id, IHK_MC_AP_CRITICAL); locals = ihk_mc_alloc_pages(size/PAGE_SIZE, IHK_MC_AP_CRITICAL);
memset(locals, 0, PAGE_SIZE * max_id); memset(locals, 0, size);
kprintf("locals = %p\n", locals); kprintf("locals = %p\n", locals);
} }
@@ -33,12 +39,12 @@ void init_processors_local(int max_id)
struct x86_cpu_local_variables *get_x86_cpu_local_variable(int id) struct x86_cpu_local_variables *get_x86_cpu_local_variable(int id)
{ {
return (struct x86_cpu_local_variables *) return (struct x86_cpu_local_variables *)
((char *)locals + (id << PAGE_SHIFT)); ((char *)locals + (LOCALS_SPAN * id));
} }
static void *get_x86_cpu_local_kstack(int id) static void *get_x86_cpu_local_kstack(int id)
{ {
return ((char *)locals + ((id + 1) << PAGE_SHIFT)); return ((char *)locals + (LOCALS_SPAN * (id + 1)));
} }
struct x86_cpu_local_variables *get_x86_this_cpu_local(void) struct x86_cpu_local_variables *get_x86_this_cpu_local(void)