litmus core: don't leak np_flag upon exec

3 files changed, 19 insertions, 1 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 11fe93f736..29498a95ac 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -54,6 +54,8 @@
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
 
+#include <linux/litmus.h>
+
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>
 #endif
@@ -1140,7 +1142,8 @@ int do_execve(char * filename,
         if (IS_ERR(file))
                 goto out_kfree;
 
-        sched_exec();
+        sched_exec();   
+        litmus_exec();
 
         bprm->p = PAGE_SIZE*MAX_ARG_PAGES-sizeof(void *);
 
diff --git a/include/linux/litmus.h b/include/linux/litmus.h
index 1e85d09ee0..858b2c3ff5 100644
--- a/include/linux/litmus.h
+++ b/include/linux/litmus.h
@@ -130,6 +130,7 @@ void send_scheduler_signals(void);
 void np_mem_kill(struct task_struct *t);
 
 void litmus_fork(struct task_struct *tsk);
+void litmus_exec(void);
 /* clean up real-time state of a task */
 void exit_litmus(struct task_struct *dead_tsk);
 
diff --git a/kernel/litmus.c b/kernel/litmus.c
index 1966e5fc90..0ea3974e20 100644
--- a/kernel/litmus.c
+++ b/kernel/litmus.c
@@ -797,6 +797,20 @@ void litmus_fork(struct task_struct* p)
                 reinit_litmus_state(p, 0);
 }
 
+/* Called upon execve().
+ * current is doing the exec.
+ * Don't let address space specific stuff leak. 
+ */
+void litmus_exec(void) 
+{
+        struct task_struct* p = current;
+
+        if (is_realtime(p)) {
+                WARN_ON(p->rt_param.inh_task);
+                p->rt_param.np_flag = NULL;
+        }
+}
+
 void exit_litmus(struct task_struct *dead_tsk)
 {
         if (is_realtime(dead_tsk))