55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From d279b2cff46efec314836f8bac88d742647bab4e Mon Sep 17 00:00:00 2001
|
|
From: Todd Lewis <todd_lewis@unc.edu>
|
|
Date: Thu, 21 Mar 2024 10:57:31 +0800
|
|
Subject: [PATCH] fix uid/gid > 2^31
|
|
|
|
---
|
|
pgrep.c | 6 +++++-
|
|
proc/readproc.h | 12 ++++++------
|
|
2 files changed, 11 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/pgrep.c b/pgrep.c
|
|
index 52264b7..b72e32d 100644
|
|
--- a/pgrep.c
|
|
+++ b/pgrep.c
|
|
@@ -204,8 +204,12 @@ static int strict_atol (const char *restrict str, long *restrict value)
|
|
|
|
for ( ; *str; ++str) {
|
|
if (! isdigit (*str))
|
|
- return (0);
|
|
+ return 0;
|
|
+ if (res >= LONG_MAX / 10)
|
|
+ return 0;
|
|
res *= 10;
|
|
+ if (res >= LONG_MAX - (*str - '0'))
|
|
+ return 0;
|
|
res += *str - '0';
|
|
}
|
|
*value = sign * res;
|
|
diff --git a/proc/readproc.h b/proc/readproc.h
|
|
index 7905ea9..7bdb37f 100644
|
|
--- a/proc/readproc.h
|
|
+++ b/proc/readproc.h
|
|
@@ -159,12 +159,12 @@ typedef struct proc_t {
|
|
session, // stat session id
|
|
nlwp, // stat,status number of threads, or 0 if no clue
|
|
tgid, // (special) thread group ID, the POSIX PID (see also: tid)
|
|
- tty, // stat full device number of controlling terminal
|
|
- /* FIXME: int uids & gids should be uid_t or gid_t from pwd.h */
|
|
- euid, egid, // stat(),status effective
|
|
- ruid, rgid, // status real
|
|
- suid, sgid, // status saved
|
|
- fuid, fgid, // status fs (used for file access only)
|
|
+ tty; // stat full device number of controlling terminal
|
|
+ uid_t euid; gid_t egid; // stat(),status effective
|
|
+ uid_t ruid; gid_t rgid; // status real
|
|
+ uid_t suid; gid_t sgid; // status saved
|
|
+ uid_t fuid; gid_t fgid; // status fs (used for file access only)
|
|
+ int
|
|
tpgid, // stat terminal process group id
|
|
exit_signal, // stat might not be SIGCHLD
|
|
processor; // stat current (or most recent?) CPU
|
|
--
|
|
2.27.0
|
|
|