oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

List of supplementary groups was not correct. Fixed.

Browse Source 
* glibtop_private.h, procuid.c, procdata.c: List of supplementary
        groups was not correct. Fixed.
This commit is contained in:
Drazen Kacar
1999-05-06 01:15:44 +00:00
parent 3f65468299
commit ab7f1cc3be
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sysdeps/solaris/ChangeLog
View File

@@ -1,3 +1,8 @@
1999-05-06 Drazen Kacar <dave@srce.hr>
* glibtop_private.h, procuid.c, procdata.c: List of supplementary
groups was not correct. Fixed.
1999-05-04 Drazen Kacar <dave@srce.hr> 1999-05-04 Drazen Kacar <dave@srce.hr>
* glibtop_machine.h: Changed boot time to unsigned long long. * glibtop_machine.h: Changed boot time to unsigned long long.

2
sysdeps/solaris/glibtop_private.h
View File

@@ -41,7 +41,7 @@ int glibtop_get_proc_data_psinfo_s (glibtop *server, struct psinfo *psinfo, pid_
int glibtop_get_proc_data_usage_s (glibtop *server, struct prusage *prusage, pid_t pid); int glibtop_get_proc_data_usage_s (glibtop *server, struct prusage *prusage, pid_t pid);
/* Read /proc/<pid>/cred */ /* Read /proc/<pid>/cred */
int glibtop_get_proc_credentials_s(glibtop *, struct prcred *, pid_t); int glibtop_get_proc_credentials_s(glibtop *, struct prcred *, gid_t *, pid_t);
/* Read /proc/<pid>/status */ /* Read /proc/<pid>/status */
int glibtop_get_proc_status_s(glibtop *, struct pstatus *, pid_t); int glibtop_get_proc_status_s(glibtop *, struct pstatus *, pid_t);

17
sysdeps/solaris/procdata.c
View File

@@ -23,6 +23,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop_private.h> #include <glibtop_private.h>
#include <glibtop/procuid.h>
#include <errno.h> #include <errno.h>
@@ -75,9 +76,13 @@ glibtop_get_proc_data_usage_s (glibtop *server, struct prusage *prusage, pid_t p
} }
int int
glibtop_get_proc_credentials_s(glibtop *server, struct prcred *prcred, pid_t pid) glibtop_get_proc_credentials_s(glibtop *server,
struct prcred *prcred,
gid_t *groups,
pid_t pid)
{ {
int fd; int fd;
size_t toread;
char buffer[BUFSIZ]; char buffer[BUFSIZ];
sprintf(buffer, "/proc/%d/cred", (int)pid); sprintf(buffer, "/proc/%d/cred", (int)pid);
@@ -93,6 +98,16 @@ glibtop_get_proc_credentials_s(glibtop *server, struct prcred *prcred, pid_t pid
glibtop_warn_io_r(server, "pread (%s)", buffer); glibtop_warn_io_r(server, "pread (%s)", buffer);
return -1; return -1;
} }
if(prcred->pr_ngroups >= 0)
{
if(prcred->pr_ngroups <= GLIBTOP_MAX_GROUPS)
toread = prcred->pr_ngroups * sizeof(gid_t);
else
toread = GLIBTOP_MAX_GROUPS * sizeof(gid_t);
if(pread(fd, groups, toread,
&(((struct prcred *)0)->pr_groups[0])) != toread)
prcred->pr_ngroups = 0;
}
close(fd); close(fd);
return 0; return 0;
} }

8
sysdeps/solaris/procuid.c
View File

@@ -53,6 +53,7 @@ glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
{ {
struct psinfo psinfo; struct psinfo psinfo;
struct prcred prcred; struct prcred prcred;
gid_t groups[GLIBTOP_MAX_GROUPS];
memset (buf, 0, sizeof (glibtop_proc_uid)); memset (buf, 0, sizeof (glibtop_proc_uid));
@@ -76,7 +77,7 @@ glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
buf->flags = _glibtop_sysdeps_proc_uid_psinfo; buf->flags = _glibtop_sysdeps_proc_uid_psinfo;
if(glibtop_get_proc_credentials_s(server, &prcred, pid)) if(glibtop_get_proc_credentials_s(server, &prcred, groups, pid))
return; return;
buf->suid = prcred.pr_suid; buf->suid = prcred.pr_suid;
@@ -85,14 +86,13 @@ glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
prcred.pr_ngroups : GLIBTOP_MAX_GROUPS; prcred.pr_ngroups : GLIBTOP_MAX_GROUPS;
if(sizeof(int) == sizeof(gid_t)) if(sizeof(int) == sizeof(gid_t))
memcpy(buf->groups, prcred.pr_groups, memcpy(buf->groups, &groups, buf->ngroups * sizeof(gid_t));
buf->ngroups * sizeof(gid_t));
else else
{ {
int i; int i;
for(i = 0; i < buf->ngroups; ++i) for(i = 0; i < buf->ngroups; ++i)
buf->groups[i] = prcred.pr_groups[i]; buf->groups[i] = groups[i];
} }
buf->flags += _glibtop_sysdeps_proc_uid_prcred; buf->flags += _glibtop_sysdeps_proc_uid_prcred;
} }