From: Arjan van de Ven <arjan@linux.intel.com>
To: linux-kernel@vger.kernel.org
Subject: [Patch 4 of 8] Add the cookie field
Date: Fri, 17 Mar 2006 17:14:02 +0100 [thread overview]
Message-ID: <1142612042.3033.108.camel@laptopd505.fenrus.org> (raw)
In-Reply-To: <1142611850.3033.100.camel@laptopd505.fenrus.org>
This patch adds the per thread cookie field to the task struct and the PDA.
Also it makes sure that the PDA value gets the new cookie value at context
switch, and that a new task gets a new cookie at task creation time
Signed-off-by: Arjan van Ven <arjan@linux.intel.com>
---
arch/x86_64/kernel/process.c | 3 +++
include/asm-x86_64/pda.h | 6 +++++-
include/linux/sched.h | 5 +++++
kernel/fork.c | 4 ++++
4 files changed, 17 insertions(+), 1 deletion(-)
Index: linux-2.6.16-rc6-stack-protector/arch/x86_64/kernel/process.c
===================================================================
--- linux-2.6.16-rc6-stack-protector.orig/arch/x86_64/kernel/process.c
+++ linux-2.6.16-rc6-stack-protector/arch/x86_64/kernel/process.c
@@ -593,6 +593,9 @@ __switch_to(struct task_struct *prev_p,
write_pda(pcurrent, next_p);
write_pda(kernelstack,
task_stack_page(next_p) + THREAD_SIZE - PDA_STACKOFFSET);
+#ifdef CONFIG_STACK_PROTECTOR
+ write_pda(stack_canary, next_p->stack_canary);
+#endif
/*
* Now maybe reload the debug registers
Index: linux-2.6.16-rc6-stack-protector/include/asm-x86_64/pda.h
===================================================================
--- linux-2.6.16-rc6-stack-protector.orig/include/asm-x86_64/pda.h
+++ linux-2.6.16-rc6-stack-protector/include/asm-x86_64/pda.h
@@ -14,7 +14,11 @@ struct x8664_pda {
unsigned long kernelstack; /* 16 */ /* top of kernel stack for current */
unsigned long oldrsp; /* 24 */ /* user rsp for system call */
unsigned long debugstack; /* 32 */ /* #DB/#BP stack. */
- int irqcount; /* 40 */ /* Irq nesting counter. Starts with -1 */
+#ifdef CONFIG_STACK_PROTECTOR
+ unsigned long stack_canary; /* 40 */ /* stack canary value */
+ /* Note: this canary MUST be at offset 40!!! */
+#endif
+ int irqcount; /* 48 */ /* Irq nesting counter. Starts with -1 */
int cpunumber; /* Logical CPU number */
char *irqstackptr; /* top of irqstack */
int nodenumber; /* number of current node */
Index: linux-2.6.16-rc6-stack-protector/include/linux/sched.h
===================================================================
--- linux-2.6.16-rc6-stack-protector.orig/include/linux/sched.h
+++ linux-2.6.16-rc6-stack-protector/include/linux/sched.h
@@ -740,6 +740,11 @@ struct task_struct {
unsigned did_exec:1;
pid_t pid;
pid_t tgid;
+
+#ifdef CONFIG_STACK_PROTECTOR
+ /* Canary value for the -fstack-protector gcc feature */
+ unsigned long stack_canary;
+#endif
/*
* pointers to (original) parent process, youngest child, younger sibling,
* older sibling, respectively. (p->father can be replaced with
Index: linux-2.6.16-rc6-stack-protector/kernel/fork.c
===================================================================
--- linux-2.6.16-rc6-stack-protector.orig/kernel/fork.c
+++ linux-2.6.16-rc6-stack-protector/kernel/fork.c
@@ -178,6 +178,10 @@ static struct task_struct *dup_task_stru
tsk->thread_info = ti;
setup_thread_stack(tsk, orig);
+#ifdef CONFIG_STACK_PROTECTOR
+ tsk->stack_canary = get_random_int();
+#endif
+
/* One for us, one for whoever does the "release_task()" (usually parent) */
atomic_set(&tsk->usage,2);
atomic_set(&tsk->fs_excl, 0);
next prev parent reply other threads:[~2006-03-17 16:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-17 16:10 [Patch 0/8] Port of -fstack-protector to the kernel Arjan van de Ven
2006-03-17 16:11 ` [Patch 1 of 8] Pack the x86-64 PDA structure Arjan van de Ven
2006-03-17 16:13 ` [Patch 3 of 8] Introduce a config option for stack-protector Arjan van de Ven
2006-03-17 16:13 ` [Patch 2 of 8] annotate the PDA structure with offsets Arjan van de Ven
2006-03-18 9:38 ` Ingo Molnar
2006-03-18 9:46 ` Arjan van de Ven
2006-03-17 16:14 ` Arjan van de Ven [this message]
2006-03-17 16:14 ` [Patch 5 of 8] Add the __stack_chk_fail() function Arjan van de Ven
2006-03-19 17:57 ` Nix
2006-03-19 18:06 ` Arjan van de Ven
2006-03-19 19:06 ` Nix
2006-03-17 16:15 ` [Patch 6 of 8] Implement the CFLAGs side Arjan van de Ven
2006-03-17 16:16 ` [Patch 7 of 8] Finish PDA offset annotations Arjan van de Ven
2006-03-17 16:17 ` [Patch 8 of 8] GCC 4.1 patch for kernel stack-protector Arjan van de Ven
2006-03-17 16:50 ` [Patch 0/8] Port of -fstack-protector to the kernel Michal Piotrowski
2006-03-17 16:53 ` Arjan van de Ven
2006-03-18 9:41 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1142612042.3033.108.camel@laptopd505.fenrus.org \
--to=arjan@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®