* [RFC/PATCH] Fix end_of_stack() and stack_not_used() for archs using CONFIG_STACK_GROWSUP
@ 2014-09-15 4:23 Chuck Ebbert
0 siblings, 0 replies; only message in thread
From: Chuck Ebbert @ 2014-09-15 4:23 UTC (permalink / raw)
To: linux-kernel@vger.kernel.org; +Cc: Aaron Tomlin, Helge Deller, James Hogan
When looking at Aaron's patches adding extra checks of the stack canary, I
realized the code almost certainly never worked if the stack grows up. Something
like this is needed, I think.
Not-Signed-Off-By: Chuck Ebbert <cebbert.lkml@gmail.com>
---
Not even compile tested.
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 5c2c885..da7f597 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2610,7 +2610,11 @@ static inline void setup_thread_stack(struct task_struct *p, struct task_struct
static inline unsigned long *end_of_stack(struct task_struct *p)
{
+#ifdef CONFIG_STACK_GROWSUP
+ return (unsigned long *)((unsigned long)task_thread_info(p) + THREAD_SIZE) - 1;
+#else
return (unsigned long *)(task_thread_info(p) + 1);
+#endif
}
#endif
@@ -2629,13 +2633,21 @@ static inline unsigned long stack_not_used(struct task_struct *p)
{
unsigned long *n = end_of_stack(p);
+#ifdef CONFIG_STACK_GROWSUP
+ do { /* Skip over canary */
+ n--;
+ } while (!*n);
+
+ return (unsigned long)end_of_stack(p) - (unsigned long)n;
+#else
do { /* Skip over canary */
n++;
} while (!*n);
return (unsigned long)n - (unsigned long)end_of_stack(p);
-}
#endif
+}
+#endif /* CONFIG_DEBUG_STACK_USAGE */
/* set thread flags in other task's structures
* - see asm/thread_info.h for TIF_xxxx flags available
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-15 4:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-15 4:23 [RFC/PATCH] Fix end_of_stack() and stack_not_used() for archs using CONFIG_STACK_GROWSUP Chuck Ebbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).