When throttling a process to enforce RACCT limits, do not use neither
PBDRY (which simply doesn't make any sense) nor PCATCH (which could be used by a malicious process to work around the PCPU limit). Submitted by: Rudo Tomori Reviewed by: kib
This commit is contained in:
parent
16befafd16
commit
a8efb53478
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=248300
@ -100,9 +100,6 @@ void
|
||||
userret(struct thread *td, struct trapframe *frame)
|
||||
{
|
||||
struct proc *p = td->td_proc;
|
||||
#ifdef RACCT
|
||||
int sig;
|
||||
#endif
|
||||
|
||||
CTR3(KTR_SYSC, "userret: thread %p (pid %d, %s)", td, p->p_pid,
|
||||
td->td_name);
|
||||
@ -175,12 +172,8 @@ userret(struct thread *td, struct trapframe *frame)
|
||||
#endif
|
||||
#ifdef RACCT
|
||||
PROC_LOCK(p);
|
||||
while (p->p_throttled == 1) {
|
||||
sig = msleep(p->p_racct, &p->p_mtx, PCATCH | PBDRY, "racct",
|
||||
hz);
|
||||
if ((sig == EINTR) || (sig == ERESTART))
|
||||
break;
|
||||
}
|
||||
while (p->p_throttled == 1)
|
||||
msleep(p->p_racct, &p->p_mtx, 0, "racct", 0);
|
||||
PROC_UNLOCK(p);
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user