zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add some security checks when running SUID root 

on Darwin, htop needs to run with root privileges to display information
about other users processes. This commit makes running htop SUID root a
bit more safe.
This commit is contained in:
Michael Klein 2015-12-02 22:15:46 +01:00
parent 670a2de692
commit d18e9a4895
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Process.c
View File

@ -513,12 +513,16 @@ void Process_toggleTag(Process* this) {
} }
bool Process_setPriority(Process* this, int priority) { bool Process_setPriority(Process* this, int priority) {
int old_prio = getpriority(PRIO_PROCESS, this->pid); if ( Process_getuid == 0 || Process_getuid == (int) this->st_uid ) {
int err = setpriority(PRIO_PROCESS, this->pid, priority); int old_prio = getpriority(PRIO_PROCESS, this->pid);
if (err == 0 && old_prio != getpriority(PRIO_PROCESS, this->pid)) { int err = setpriority(PRIO_PROCESS, this->pid, priority);
this->nice = priority; if (err == 0 && old_prio != getpriority(PRIO_PROCESS, this->pid)) {
this->nice = priority;
}
return (err == 0);
} }
return (err == 0); else
return false;
} }
bool Process_changePriorityBy(Process* this, size_t delta) { bool Process_changePriorityBy(Process* this, size_t delta) {
@ -526,7 +530,8 @@ bool Process_changePriorityBy(Process* this, size_t delta) {
} }
void Process_sendSignal(Process* this, size_t sgn) { void Process_sendSignal(Process* this, size_t sgn) {
kill(this->pid, (int) sgn); if ( Process_getuid == 0 || Process_getuid == (int) this->st_uid )
kill(this->pid, (int) sgn);
} }
long Process_pidCompare(const void* v1, const void* v2) { long Process_pidCompare(const void* v1, const void* v2) {

1
TraceScreen.c
View File

@ -86,6 +86,7 @@ void TraceScreen_run(TraceScreen* this) {
int child = fork(); int child = fork();
if (child == -1) return; if (child == -1) return;
if (child == 0) { if (child == 0) {
seteuid(getuid());
dup2(fdpair[1], STDERR_FILENO); dup2(fdpair[1], STDERR_FILENO);
int ok = fcntl(fdpair[1], F_SETFL, O_NONBLOCK); int ok = fcntl(fdpair[1], F_SETFL, O_NONBLOCK);
if (ok != -1) { if (ok != -1) {