mirror of https://github.com/xzeldon/htop.git
drop privileges before changing process priority or sending signals
- replaces uid check from d18e9a4895
This commit is contained in:
parent
42b08f2233
commit
ab3a7c2fa8
23
Process.c
23
Process.c
|
@ -513,16 +513,15 @@ void Process_toggleTag(Process* this) {
|
|||
}
|
||||
|
||||
bool Process_setPriority(Process* this, int priority) {
|
||||
if ( Process_getuid == 0 || Process_getuid == (int) this->st_uid ) {
|
||||
int old_prio = getpriority(PRIO_PROCESS, this->pid);
|
||||
int err = setpriority(PRIO_PROCESS, this->pid, priority);
|
||||
if (err == 0 && old_prio != getpriority(PRIO_PROCESS, this->pid)) {
|
||||
this->nice = priority;
|
||||
}
|
||||
return (err == 0);
|
||||
uid_t euid = geteuid();
|
||||
seteuid(getuid());
|
||||
int old_prio = getpriority(PRIO_PROCESS, this->pid);
|
||||
int err = setpriority(PRIO_PROCESS, this->pid, priority);
|
||||
seteuid(euid);
|
||||
if (err == 0 && old_prio != getpriority(PRIO_PROCESS, this->pid)) {
|
||||
this->nice = priority;
|
||||
}
|
||||
else
|
||||
return false;
|
||||
return (err == 0);
|
||||
}
|
||||
|
||||
bool Process_changePriorityBy(Process* this, size_t delta) {
|
||||
|
@ -530,8 +529,10 @@ bool Process_changePriorityBy(Process* this, size_t delta) {
|
|||
}
|
||||
|
||||
void Process_sendSignal(Process* this, size_t sgn) {
|
||||
if ( Process_getuid == 0 || Process_getuid == (int) this->st_uid )
|
||||
kill(this->pid, (int) sgn);
|
||||
uid_t euid = geteuid();
|
||||
seteuid(getuid());
|
||||
kill(this->pid, (int) sgn);
|
||||
seteuid(euid);
|
||||
}
|
||||
|
||||
long Process_pidCompare(const void* v1, const void* v2) {
|
||||
|
|
|
@ -158,6 +158,8 @@ typedef struct ProcessClass_ {
|
|||
#define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K)
|
||||
#define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K)
|
||||
|
||||
extern char Process_pidFormat[20];
|
||||
|
||||
void Process_setupColumnWidths();
|
||||
|
||||
void Process_humanNumber(RichString* str, unsigned long number, bool coloring);
|
||||
|
|
Loading…
Reference in New Issue