Browse Source

Kernel: Clearing promises with pledge("") should fail

Thanks Sergey for catching this brain-fart. :^)
Andreas Kling 5 years ago
parent
commit
d1839ae0c9
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Kernel/Process.cpp

+ 2 - 2
Kernel/Process.cpp

@@ -4417,7 +4417,7 @@ int Process::sys$pledge(const Syscall::SC_pledge_params* user_params)
         u32 new_promises = 0;
         u32 new_promises = 0;
         if (!parse_pledge(promises, new_promises))
         if (!parse_pledge(promises, new_promises))
             return -EINVAL;
             return -EINVAL;
-        if (m_promises && new_promises & ~m_promises)
+        if (m_promises && (!new_promises || new_promises & ~m_promises))
             return -EPERM;
             return -EPERM;
         m_promises = new_promises;
         m_promises = new_promises;
     }
     }
@@ -4426,7 +4426,7 @@ int Process::sys$pledge(const Syscall::SC_pledge_params* user_params)
         u32 new_execpromises = 0;
         u32 new_execpromises = 0;
         if (!parse_pledge(execpromises, new_execpromises))
         if (!parse_pledge(execpromises, new_execpromises))
             return -EINVAL;
             return -EINVAL;
-        if (m_execpromises && new_execpromises & ~m_execpromises)
+        if (m_execpromises && (!new_execpromises || new_execpromises & ~m_execpromises))
             return -EPERM;
             return -EPERM;
         m_execpromises = new_execpromises;
         m_execpromises = new_execpromises;
     }
     }