Martin Baulig
5e97af535f
* Splitted `libgtop_sysdeps.la' into `libgtop_sysdeps.la' and
`libgtop_sysdeps_suid.la'.
Everything that needs to be suid/sgid is in `libgtop_sysdeps_suid.la'
and the rest in `libgtop_sysdeps.la'.
The functions from `libgtop_sysdeps_suid.la' have the `_p' prefix and
the ones from `libgtop_sysdeps.la' the `_s' prefix.
The suid library uses `glibtop_open_p' and `glibtop_close_p', the
normal one `glibtop_init_s' (found in lib/init.c), `glibtop_open_s'
and `glibtop_close_s'.
* Added `libgtop_suid_common.la' containing stuff from sysdeps/common
that is required from the suid server (currently everything from
error.c and xmalloc.c).
This means, we can add some more stuff to `libgtop_common.la' without
the risk that it may be dangerous in the suid server.
* The ``library order'' is much clearer now:
-> `libgtop.la' (from lib/) contains user-level stuff;
all functions except `glibtop_init_r' have the `_l'
suffix.
-> `libgtop_common.la' (from sysdeps/common/) contains stuff
that is common among the sysdeps directories.
use anything from `libgtop_sysdeps.la' and
`libgtop_sysdeps_suid.la'.
-> `libgtop_sysdeps.la' (from sysdeps/<sysdeps_dir>/) contains
everything from the sysdeps directory that doesn't need to
be suid/sgid.
-> `libgtop_suid_common.la' (from sysdeps/common/) is used from
the suid server instead of `libgtop_common.la'.
-> `libgtop_sysdeps_suid.la' (from sysdeps/<sysdeps_dir>/) contains
everything from the sysdeps directory that needs to be in the
suid server.
* To summarize: the server is linked only with functions that need
to be suid and everything else is linked only with functions that
do not need to be suid.
Martin
1998-07-22 Martin Baulig <martin@home-of-linux.org>
* lib/init.c (glibtop_init_s): Added this init function of
the sysdeps directory `libgtop_sysdeps.la'.
* lib/open.c (glibtop_open_l): Unconditionally calling
`glibtop_init_s' after server initialization.
* lib/lib.awk: Removed references to functions from
`libgtop_sysdeps_suid.la' to avoid undefined symbols.
* sysdeps/stub/open.c (glibtop_open_s): Renamed this
function from `glibtop_open_r'.
* sysdeps/stub/close.c (glibtop_close_s): Renamed this
function from `glibtop_close_l'.
* sysdeps/kernel/open.c (glibtop_open_s): Renamed this
function from `glibtop_open_r'.
* sysdeps/kernel/close.c (glibtop_close_s): Renamed this
function from `glibtop_close_l'.
* sysdeps/linux/open.c (glibtop_open_s): Renamed this
function from `glibtop_open_r'.
* sysdeps/linux/close.c (glibtop_close_s): Renamed this
function from `glibtop_close_l'.
* sysdeps/osf1/Makefile.am (lib_LTLIBRARIES): Added
`libgtop_sysdeps_suid.la' for the suid server.
* sysdeps/osf1/open_suid.c (glibtop_open_p): New file.
Contains all stuff that was formerly in `open.c'.
* sysdeps/osf1/open.c: Moved everything from here into
the new file `open_suid.c'.
* sysdeps/osf1/open.c (glibtop_open_s): New function.
* sysdeps/osf1/close_suid.c (glibtop_close_p): New file.
* sysdeps/osf1/close.c (glibtop_close_s): New function.
* sysdeps/osf1/*.c: Using the new init, open and close
functions.
* sysdeps/sun4/Makefile.am (lib_LTLIBRARIES): Added
`libgtop_sysdeps_suid.la' for the suid server.
* sysdeps/sun4/nosuid.c (glibtop_open_s, glibtop_close_s): New file
* sysdeps/sun4/*.c: All functions now have the `_p' suffix.
* sysdeps/common/Makefile.am (lib_LTLIBRARIES): Added
`libgtop_suid_common.la' which only contains stuff that is
needed in the suid parts.
* sysdeps/common/xmalloc.c: Using `glibtop_error_io_r' instead
of `glibtop_error_r'.
* sysdeps/{kernel, linux, osf1, sun4, stub}/init.c: Removed.
`glibtop_init_s' has been moved into `lib/init.c' since it's the
same in all the sysdeps directories.
* src/server/main.c: It is now an error to request a feature that
does not need the suid server.
* src/proxy: Removed.
275 lines
7.0 KiB
C
275 lines
7.0 KiB
C
/* $Id$ */
|
|
|
|
/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the Gnome Top Library.
|
|
Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
|
|
|
|
The Gnome Top Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The Gnome Top Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <glibtop/command.h>
|
|
#include <glibtop/version.h>
|
|
#include <glibtop/xmalloc.h>
|
|
#include <glibtop/union.h>
|
|
#include <glibtop/open.h>
|
|
|
|
#include <fcntl.h>
|
|
#include <locale.h>
|
|
|
|
#if defined(HAVE_GETDTABLESIZE)
|
|
#define GET_MAX_FDS() getdtablesize()
|
|
#else
|
|
/* Fallthrough case - please add other #elif cases above
|
|
for different OS's as necessary */
|
|
#define GET_MAX_FDS() 256
|
|
#endif
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
pid_t pid;
|
|
int fd, max_fd, nread;
|
|
size_t size, dsize;
|
|
char parameter [BUFSIZ];
|
|
glibtop_union data;
|
|
glibtop_command cmnd;
|
|
glibtop_sysdeps sysdeps;
|
|
glibtop server;
|
|
void *ptr;
|
|
|
|
/* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
|
|
|
|
int uid, euid, gid, egid;
|
|
|
|
uid = getuid (); euid = geteuid ();
|
|
gid = getgid (); egid = getegid ();
|
|
|
|
glibtop_version ();
|
|
|
|
glibtop_open_p (&server, argv [0], 0, 0);
|
|
|
|
if (setreuid (euid, uid)) _exit (1);
|
|
|
|
if (setregid (egid, gid)) _exit (1);
|
|
|
|
/* !!! END OF SUID ROOT PART !!! */
|
|
|
|
/* close all file descriptors except ones used by the pipes (0 and 1). */
|
|
max_fd = GET_MAX_FDS();
|
|
for(fd = 3 /* The first fd after the pipes */; fd < max_fd; fd++)
|
|
close(fd);
|
|
|
|
while(1) {
|
|
/* block on read from client */
|
|
nread = read (0, &size, sizeof (size_t));
|
|
|
|
/* will return 0 if parent exits. */
|
|
|
|
if (nread == 0)
|
|
_exit(0);
|
|
|
|
if (nread != sizeof (size_t))
|
|
_exit(1);
|
|
|
|
if (size != sizeof (glibtop_command))
|
|
_exit(2);
|
|
|
|
nread = read (0, &cmnd, size);
|
|
|
|
/* will return 0 if parent exits. */
|
|
|
|
if (nread == 0)
|
|
_exit(0);
|
|
|
|
if (nread < 0)
|
|
_exit(1);
|
|
|
|
nread = read (0, &dsize, sizeof (size_t));
|
|
|
|
/* will return 0 if parent exits. */
|
|
|
|
if (nread == 0)
|
|
_exit(0);
|
|
|
|
if (nread < 0)
|
|
_exit(1);
|
|
|
|
if (dsize >= BUFSIZ)
|
|
_exit(3);
|
|
|
|
memset (parameter, 0, sizeof (parameter));
|
|
|
|
if (dsize) {
|
|
nread = read (0, parameter, dsize);
|
|
|
|
/* will return 0 if parent exits. */
|
|
|
|
if (nread == 0)
|
|
_exit(0);
|
|
|
|
if (nread < 0)
|
|
_exit(1);
|
|
}
|
|
|
|
switch (cmnd.command) {
|
|
case GLIBTOP_CMND_SYSDEPS:
|
|
sysdeps.features = GLIBTOP_SYSDEPS_ALL;
|
|
glibtop_output (sizeof (glibtop_sysdeps), &sysdeps);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#if GLIBTOP_SUID_CPU
|
|
case GLIBTOP_CMND_CPU:
|
|
glibtop_get_cpu_p (&server, &data.cpu);
|
|
glibtop_output (sizeof (glibtop_cpu), &data.cpu);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_MEM
|
|
case GLIBTOP_CMND_MEM:
|
|
glibtop_get_mem_p (&server, &data.mem);
|
|
glibtop_output (sizeof (glibtop_mem), &data.mem);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_SWAP
|
|
case GLIBTOP_CMND_SWAP:
|
|
glibtop_get_swap_p (&server, &data.swap);
|
|
glibtop_output (sizeof (glibtop_swap), &data.swap);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_UPTIME
|
|
case GLIBTOP_CMND_UPTIME:
|
|
glibtop_get_uptime_p (&server, &data.uptime);
|
|
glibtop_output (sizeof (glibtop_uptime), &data.uptime);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_LOADAVG
|
|
case GLIBTOP_CMND_LOADAVG:
|
|
glibtop_get_loadavg_p (&server, &data.loadavg);
|
|
glibtop_output (sizeof (glibtop_loadavg), &data.loadavg);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_SHM_LIMITS
|
|
case GLIBTOP_CMND_SHM_LIMITS:
|
|
glibtop_get_shm_limits_p (&server, &data.shm_limits);
|
|
glibtop_output (sizeof (glibtop_shm_limits),
|
|
&data.shm_limits);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_MSG_LIMITS
|
|
case GLIBTOP_CMND_MSG_LIMITS:
|
|
glibtop_get_msg_limits_p (&server, &data.msg_limits);
|
|
glibtop_output (sizeof (glibtop_msg_limits),
|
|
&data.msg_limits);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_SEM_LIMITS
|
|
case GLIBTOP_CMND_SEM_LIMITS:
|
|
glibtop_get_sem_limits_p (&server, &data.sem_limits);
|
|
glibtop_output (sizeof (glibtop_sem_limits),
|
|
&data.sem_limits);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_PROCLIST
|
|
case GLIBTOP_CMND_PROCLIST:
|
|
ptr = glibtop_get_proclist_p (&server, &data.proclist);
|
|
glibtop_output (sizeof (glibtop_proclist),
|
|
&data.proclist);
|
|
glibtop_output (data.proclist.total, ptr);
|
|
if (ptr) free (ptr);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_PROC_STATE
|
|
case GLIBTOP_CMND_PROC_STATE:
|
|
memcpy (&pid, parameter, sizeof (pid_t));
|
|
glibtop_get_proc_state_p
|
|
(&server, &data.proc_state, pid);
|
|
glibtop_output (sizeof (glibtop_proc_state),
|
|
&data.proc_state);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_PROC_UID
|
|
case GLIBTOP_CMND_PROC_UID:
|
|
memcpy (&pid, parameter, sizeof (pid_t));
|
|
glibtop_get_proc_uid_p
|
|
(&server, &data.proc_uid, pid);
|
|
glibtop_output (sizeof (glibtop_proc_uid),
|
|
&data.proc_uid);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_PROC_MEM
|
|
case GLIBTOP_CMND_PROC_MEM:
|
|
memcpy (&pid, parameter, sizeof (pid_t));
|
|
glibtop_get_proc_mem_p
|
|
(&server, &data.proc_mem, pid);
|
|
glibtop_output (sizeof (glibtop_proc_mem),
|
|
&data.proc_mem);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_PROC_TIME
|
|
case GLIBTOP_CMND_PROC_TIME:
|
|
memcpy (&pid, parameter, sizeof (pid_t));
|
|
glibtop_get_proc_time_p
|
|
(&server, &data.proc_time, pid);
|
|
glibtop_output (sizeof (glibtop_proc_time),
|
|
&data.proc_time);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_PROC_SIGNAL
|
|
case GLIBTOP_CMND_PROC_SIGNAL:
|
|
memcpy (&pid, parameter, sizeof (pid_t));
|
|
glibtop_get_proc_signal_p
|
|
(&server, &data.proc_signal, pid);
|
|
glibtop_output (sizeof (glibtop_proc_signal),
|
|
&data.proc_signal);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_PROC_KERNEL
|
|
case GLIBTOP_CMND_PROC_KERNEL:
|
|
memcpy (&pid, parameter, sizeof (pid_t));
|
|
glibtop_get_proc_kernel_p
|
|
(&server, &data.proc_kernel, pid);
|
|
glibtop_output (sizeof (glibtop_proc_kernel),
|
|
&data.proc_kernel);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
#if GLIBTOP_SUID_PROC_SEGMENT
|
|
case GLIBTOP_CMND_PROC_SEGMENT:
|
|
memcpy (&pid, parameter, sizeof (pid_t));
|
|
glibtop_get_proc_segment_p
|
|
(&server, &data.proc_segment, pid);
|
|
glibtop_output (sizeof (glibtop_proc_segment),
|
|
&data.proc_segment);
|
|
glibtop_output (0, NULL);
|
|
break;
|
|
#endif
|
|
default:
|
|
_exit(1);
|
|
}
|
|
}
|
|
_exit(0);
|
|
}
|