#112 followup (bugfix and fix build) (#114)

nuta · Dec 13, 2021 · 1f9c2b4 · 1f9c2b4
1 parent a336e48
commit 1f9c2b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/kernel/process/process.rs b/kernel/process/process.rs
@@ -15,7 +15,7 @@ use crate::{
         elf::{Elf, ProgramHeader},
         init_stack::{estimate_user_init_stack_size, init_user_stack, Auxv},
         process_group::{PgId, ProcessGroup},
-        signal::{SigAction, Signal, SignalDelivery, SignalMask, SIGCHLD, SIGKILL},
+        signal::{SigAction, SigSet, Signal, SignalDelivery, SignalMask, SIGCHLD, SIGKILL},
         switch, UserVAddr, JOIN_WAIT_QUEUE, SCHEDULER,
     },
     random::read_secure_random,
@@ -38,8 +38,6 @@ use kerla_runtime::{
 };
 use kerla_utils::{alignment::align_up, bitmap::BitMap};
 
-use super::signal::SigSet;
-
 type ProcessTable = BTreeMap<PId, Arc<Process>>;
 
 /// The process table. All processes are registered in with its process Id.

diff --git a/kernel/syscalls/rt_sigprocmask.rs b/kernel/syscalls/rt_sigprocmask.rs
@@ -13,20 +13,18 @@ impl SyscallHandler<'_> {
         oldset: Option<UserVAddr>,
         length: usize,
     ) -> Result<isize> {
-        if length != 8{
+        if length != 8 {
             debug_warn!("sys_rt_sigprocmask length argument is not equal 8");
         }
-        
+
         let how = match how {
             0 => SignalMask::Block,
             1 => SignalMask::Unblock,
             2 => SignalMask::Set,
             _ => return Err(Errno::EINVAL.into()),
         };
 
-        if let Err(_) = current_process().set_signal_mask(how, set, oldset, length) {
-            return Err(Errno::EFAULT.into());
-        }
+        current_process().set_signal_mask(how, set, oldset, length)?;
 
         Ok(0)
     }