Index: kernel/generic/src/security/cap.c
===================================================================
--- kernel/generic/src/security/cap.c	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/generic/src/security/cap.c	(revision ee289cf012d5ee670798a55abcda583a5b9988e4)
@@ -112,5 +112,5 @@
 	spinlock_lock(&tasks_lock);
 	t = task_find_by_id((task_id_t) taskid_arg.value);
-	if (!t) {
+	if ((!t) || (!context_check(CONTEXT, t->context))) {
 		spinlock_unlock(&tasks_lock);
 		interrupts_restore(ipl);
@@ -123,7 +123,4 @@
 	
 	spinlock_unlock(&tasks_lock);
-	
-
-	
 	interrupts_restore(ipl);	
 	return 0;
@@ -154,5 +151,5 @@
 	spinlock_lock(&tasks_lock);	
 	t = task_find_by_id((task_id_t) taskid_arg.value);
-	if (!t) {
+	if ((!t) || (!context_check(CONTEXT, t->context))) {
 		spinlock_unlock(&tasks_lock);
 		interrupts_restore(ipl);