linux-mips
[Top] [All Lists]

Re: [PATCH] User stack pointer randomisation

To: Ralf Baechle <ralf@linux-mips.org>
Subject: Re: [PATCH] User stack pointer randomisation
From: Franck Bui-Huu <vagabon.xyz@gmail.com>
Date: Thu, 19 Jul 2007 14:40:57 +0200
Cc: nigel@mips.com, linux-mips <linux-mips@linux-mips.org>
Dkim-signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:reply-to:user-agent:mime-version:to:cc:subject:references:in-reply-to:x-enigmail-version:content-type:content-transfer-encoding:from; b=ESHFpIU8QYnf0ZSk602MTR4EiRnj6pU/6iy5tKE8hyvypoOnEunngL6fae9h7AUeg2P9HymLyenT7UJmjvXdGMFi6gNV1v8djhAKFsOgZlyalQTunYwxzCVplxMPYQxUQ0GXPUGpUbYz9CoZKbsWdstIX3fNr2wUwgGINzpT/w8=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:reply-to:user-agent:mime-version:to:cc:subject:references:in-reply-to:x-enigmail-version:content-type:content-transfer-encoding:from; b=CmFQEbklL7ENb3Z2K+iKLYv7suVZ7/qESgPsfz2iDcfDQRKe/AKLY5l5ki4NBfu76Jfzl5SGxyd2x0hyLbWzbaPcMYWNveCV0swAFKOr4YXgVf+m88yGOUFPkRqN7q/FJNftcMwKgn7pExQeDFEkR5RJU/EYZXZHXFAfo0GSYr4=
In-reply-to: <20070719123030.GA21934@linux-mips.org>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <469F5345.5010209@innova-card.com> <20070719123030.GA21934@linux-mips.org>
Reply-to: Franck <vagabon.xyz@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Thunderbird 1.5.0.4 (X11/20060614)
Ralf Baechle wrote:
> On Thu, Jul 19, 2007 at 02:04:21PM +0200, Franck Bui-Huu wrote:
> 
> Okay, applied.
> 

ouch you were too fast ;)

I think Nigel is right in his last comment.

Do you care to amend this on top of what you applied ?

-- 8< --

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 42a60b4..d6b9653 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -27,7 +27,6 @@
 #include <linux/kallsyms.h>
 #include <linux/random.h>
 
-#include <asm/asm.h>
 #include <asm/bootinfo.h>
 #include <asm/cpu.h>
 #include <asm/dsp.h>
@@ -464,13 +463,14 @@ out:
 }
 
 /*
- * Don't forget that the stack pointer must be aligned on a 8 bytes
- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
+ * The stack pointer must be aligned on a 8 bytes boundary for 32-bits
+ * ABI and 16 bytes for 64-bits ABI. To make things simple we force to
+ * the maximum alignment required by any ABI.
  */
 unsigned long arch_align_stack(unsigned long sp)
 {
        if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
                sp -= get_random_int() & ~PAGE_MASK;
 
-       return sp & ALMASK;
+       return sp & ~0xf;
 }

<Prev in Thread] Current Thread [Next in Thread>