libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use PROCESS/THREAD_QUERY_LIMITED_INFORMATION where appropriate 

Using PROCESS/THREAD_QUERY_INFORMATION may limit the number of
processes/threads we can inspect depending on their integrity level.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2016-06-27 17:56:16 +02:00
parent d21b63594c
commit ba58e5f20c
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
winsup/cygwin/fhandler_process.cc
View File

@ -702,7 +702,8 @@ struct thread_info
free (buf); free (buf);
return; return;
} }
proc = (PSYSTEM_PROCESS_INFORMATION) ((PBYTE) proc + proc->NextEntryOffset); proc = (PSYSTEM_PROCESS_INFORMATION) ((PBYTE) proc
+ proc->NextEntryOffset);
} }
thread = proc->Threads; thread = proc->Threads;
for (ULONG i = 0; i < proc->NumberOfThreads; ++i) for (ULONG i = 0; i < proc->NumberOfThreads; ++i)
@ -711,8 +712,9 @@ struct thread_info
TEB teb; TEB teb;
HANDLE thread_h; HANDLE thread_h;
if (!(thread_h = OpenThread (THREAD_QUERY_INFORMATION, FALSE, thread_h = OpenThread (THREAD_QUERY_LIMITED_INFORMATION, FALSE,
(ULONG) (ULONG_PTR) thread[i].ClientId.UniqueThread))) (ULONG) (ULONG_PTR) thread[i].ClientId.UniqueThread);
if (!thread_h)
continue; continue;
status = NtQueryInformationThread (thread_h, ThreadBasicInformation, status = NtQueryInformationThread (thread_h, ThreadBasicInformation,
&tbi, sizeof tbi, NULL); &tbi, sizeof tbi, NULL);
@ -722,7 +724,8 @@ struct thread_info
region *r = (region *) malloc (sizeof (region)); region *r = (region *) malloc (sizeof (region));
if (r) if (r)
{ {
*r = (region) { regions, (ULONG) (ULONG_PTR) thread[i].ClientId.UniqueThread, *r = (region) { regions,
(ULONG) (ULONG_PTR) thread[i].ClientId.UniqueThread,
(char *) tbi.TebBaseAddress, (char *) tbi.TebBaseAddress,
(char *) tbi.TebBaseAddress (char *) tbi.TebBaseAddress
+ 2 * wincap.page_size (), + 2 * wincap.page_size (),
@ -792,8 +795,8 @@ static off_t
format_process_maps (void *data, char *&destbuf) format_process_maps (void *data, char *&destbuf)
{ {
_pinfo *p = (_pinfo *) data; _pinfo *p = (_pinfo *) data;
HANDLE proc = OpenProcess (PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, HANDLE proc = OpenProcess (PROCESS_QUERY_LIMITED_INFORMATION
FALSE, p->dwProcessId); | PROCESS_VM_READ, FALSE, p->dwProcessId);
if (!proc) if (!proc)
return 0; return 0;
@ -1075,7 +1078,7 @@ format_process_stat (void *data, char *&destbuf)
QUOTA_LIMITS ql; QUOTA_LIMITS ql;
SYSTEM_TIMEOFDAY_INFORMATION stodi; SYSTEM_TIMEOFDAY_INFORMATION stodi;
SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION spt; SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION spt;
hProcess = OpenProcess (PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, hProcess = OpenProcess (PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_VM_READ,
FALSE, p->dwProcessId); FALSE, p->dwProcessId);
if (hProcess != NULL) if (hProcess != NULL)
{ {

8
winsup/cygwin/pinfo.cc
View File

@ -517,7 +517,8 @@ _pinfo::exists ()
bool bool
_pinfo::alive () _pinfo::alive ()
{ {
HANDLE h = OpenProcess (PROCESS_QUERY_INFORMATION, false, dwProcessId); HANDLE h = OpenProcess (PROCESS_QUERY_LIMITED_INFORMATION, false,
dwProcessId);
if (h) if (h)
CloseHandle (h); CloseHandle (h);
return !!h; return !!h;
@ -872,7 +873,8 @@ open_commune_proc_parms (DWORD pid, PRTL_USER_PROCESS_PARAMETERS prupp)
PROCESS_BASIC_INFORMATION pbi; PROCESS_BASIC_INFORMATION pbi;
PEB lpeb; PEB lpeb;
proc = OpenProcess (PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid); proc = OpenProcess (PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_VM_READ,
FALSE, pid);
if (!proc) if (!proc)
return NULL; return NULL;
status = NtQueryInformationProcess (proc, ProcessBasicInformation, status = NtQueryInformationProcess (proc, ProcessBasicInformation,
@ -1243,7 +1245,7 @@ winpids::add (DWORD& nelem, bool winpid, DWORD pid)
{ {
/* Open a process to prevent a subsequent exit from invalidating the /* Open a process to prevent a subsequent exit from invalidating the
shared memory region. */ shared memory region. */
onreturn = OpenProcess (PROCESS_QUERY_INFORMATION, false, pid); onreturn = OpenProcess (PROCESS_QUERY_LIMITED_INFORMATION, false, pid);
/* If we couldn't open the process then we don't have rights to it and should /* If we couldn't open the process then we don't have rights to it and should
make a copy of the shared memory area when it exists (it may not). */ make a copy of the shared memory area when it exists (it may not). */

3
winsup/cygwin/sched.cc
View File

@ -88,7 +88,8 @@ sched_getparam (pid_t pid, struct sched_param *param)
set_errno (ESRCH); set_errno (ESRCH);
return -1; return -1;
} }
process = OpenProcess (PROCESS_QUERY_INFORMATION, FALSE, p->dwProcessId); process = OpenProcess (PROCESS_QUERY_LIMITED_INFORMATION, FALSE,
p->dwProcessId);
if (!process) if (!process)
{ {
set_errno (ESRCH); set_errno (ESRCH);

5
winsup/cygwin/times.cc
View File

@ -528,7 +528,8 @@ clock_gettime (clockid_t clk_id, struct timespec *tp)
return -1; return -1;
} }
hProcess = OpenProcess (PROCESS_QUERY_INFORMATION, 0, p->dwProcessId); hProcess = OpenProcess (PROCESS_QUERY_LIMITED_INFORMATION, 0,
p->dwProcessId);
NtQueryInformationProcess (hProcess, ProcessTimes, NtQueryInformationProcess (hProcess, ProcessTimes,
&kut, sizeof kut, NULL); &kut, sizeof kut, NULL);
@ -550,7 +551,7 @@ clock_gettime (clockid_t clk_id, struct timespec *tp)
if (thr_id == 0) if (thr_id == 0)
thr_id = pthread::self ()->getsequence_np (); thr_id = pthread::self ()->getsequence_np ();
hThread = OpenThread (THREAD_QUERY_INFORMATION, 0, thr_id); hThread = OpenThread (THREAD_QUERY_LIMITED_INFORMATION, 0, thr_id);
if (!hThread) if (!hThread)
{ {
set_errno (EINVAL); set_errno (EINVAL);