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

drop privileges before reading environment

This commit is contained in:
Michael Klein 2016-01-06 22:52:37 +01:00
parent b10e54cdee
commit b14f89e9d4
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
EnvScreen.c
View File

@ -60,12 +60,13 @@ static inline void addLine(const char* line, Vector* lines, Panel* panel, const
static void EnvScreen_scan(EnvScreen* this, Vector* lines, IncSet* inc) { static void EnvScreen_scan(EnvScreen* this, Vector* lines, IncSet* inc) {
Panel* panel = this->display; Panel* panel = this->display;
int idx = MAX(Panel_getSelectedIndex(panel), 0); int idx = MAX(Panel_getSelectedIndex(panel), 0);
uid_t uid = getuid();
Panel_prune(panel); Panel_prune(panel);
if (uid == 0 || uid == this->process->st_uid) { uid_t euid = geteuid();
seteuid(getuid());
char *env = Platform_getProcessEnv(this->process->pid); char *env = Platform_getProcessEnv(this->process->pid);
seteuid(euid);
if (env) { if (env) {
for (char *p = env; *p; p = strrchr(p, 0)+1) for (char *p = env; *p; p = strrchr(p, 0)+1)
addLine(p, lines, panel, IncSet_filter(inc)); addLine(p, lines, panel, IncSet_filter(inc));
@ -74,10 +75,6 @@ static void EnvScreen_scan(EnvScreen* this, Vector* lines, IncSet* inc) {
else { else {
addLine("Could not read process environment.", lines, panel, IncSet_filter(inc)); addLine("Could not read process environment.", lines, panel, IncSet_filter(inc));
} }
}
else {
addLine("Process belongs to different user.", lines, panel, IncSet_filter(inc));
}
Vector_insertionSort(lines); Vector_insertionSort(lines);
Vector_insertionSort(panel->items); Vector_insertionSort(panel->items);