valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 18:08:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux/processes: fix infinite loop, throw away workaround

Browse Source
This commit is contained in:
Alexander Polyakov 2014-11-04 15:20:41 +03:00
parent a23e59bb9f
commit a60230af5e
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osquery/tables/system/linux/processes.cpp
View File

@ -8,7 +8,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
#include <proc/readproc.h>
#include <boost/lexical_cast.hpp>
@ -86,20 +85,9 @@ std::map<std::string, std::string> proc_env(const proc_t* proc_info) {
std::string attr = osquery::tables::proc_attr("environ", proc_info);
std::string buf;
uid_t euid = geteuid();
struct stat info;
if (stat(filename, &info) == -1) {
return env;
}
// Avoid a non-su block: https://github.com/facebook/osquery/issues/323
if (euid != 0 && info.st_uid != euid) {
return env;
}
std::ifstream fd(attr, std::ios::in | std::ios::binary);
while (!fd.eof()) {
while (!(fd.fail() || fd.eof())) {
std::getline(fd, buf, '\0');
size_t idx = buf.find_first_of("=");