Prevent nested signals, fix check for PID > 0

redox-os · Jul 23, 2017 · ef8c120 · ef8c120
1 parent 07262fd
commit ef8c120
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/context/switch.rs b/src/context/switch.rs
@@ -98,7 +98,9 @@ pub unsafe fn switch() -> bool {
                 let mut context = context_lock.write();
                 if check_context(&mut context) {
                     to_ptr = context.deref_mut() as *mut Context;
-                    to_sig = context.pending.pop_front();
+                    if (&mut *to_ptr).ksig.is_none() {
+                        to_sig = context.pending.pop_front();
+                    }
                     break;
                 }
             }
@@ -110,7 +112,9 @@ pub unsafe fn switch() -> bool {
                     let mut context = context_lock.write();
                     if check_context(&mut context) {
                         to_ptr = context.deref_mut() as *mut Context;
-                        to_sig = context.pending.pop_front();
+                        if (&mut *to_ptr).ksig.is_none() {
+                            to_sig = context.pending.pop_front();
+                        }
                         break;
                     }
                 }

diff --git a/src/syscall/process.rs b/src/syscall/process.rs
@@ -1041,7 +1041,7 @@ pub fn kill(pid: ContextId, sig: usize) -> Result<usize> {
             }
         };
 
-        if pid.into() > 0 {
+        if pid.into() as isize > 0 {
             // Send to a single process
             if let Some(context_lock) = contexts.get(pid) {
                 let mut context = context_lock.write();