[BusyBox-cvs] svn commit: trunk/busybox: coreutils include libbb loginutils proc etc...
landley at busybox.net
landley at busybox.net
Tue May 3 06:25:51 UTC 2005
Author: landley
Date: 2005-05-03 00:25:50 -0600 (Tue, 03 May 2005)
New Revision: 10238
Log:
A patch from Takeharu KATO to update/fix SE-Linux support.
Modified:
trunk/busybox/Makefile
trunk/busybox/coreutils/id.c
trunk/busybox/coreutils/ls.c
trunk/busybox/include/libbb.h
trunk/busybox/libbb/find_pid_by_name.c
trunk/busybox/libbb/procps.c
trunk/busybox/libbb/run_shell.c
trunk/busybox/loginutils/login.c
trunk/busybox/loginutils/su.c
trunk/busybox/loginutils/sulogin.c
trunk/busybox/procps/ps.c
trunk/busybox/procps/top.c
Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/Makefile 2005-05-03 06:25:50 UTC (rev 10238)
@@ -47,8 +47,7 @@
SRC_DIRS:=$(patsubst %,$(top_srcdir)/%,$(DIRS))
ifeq ($(strip $(CONFIG_SELINUX)),y)
-CFLAGS += -I/usr/include/selinux
-LIBRARIES += -lsecure
+LIBRARIES += -lselinux
endif
CONFIG_CONFIG_IN = $(top_srcdir)/sysdeps/$(TARGET_OS)/Config.in
Modified: trunk/busybox/coreutils/id.c
===================================================================
--- trunk/busybox/coreutils/id.c 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/coreutils/id.c 2005-05-03 06:25:50 UTC (rev 10238)
@@ -32,8 +32,7 @@
#include <sys/types.h>
#ifdef CONFIG_SELINUX
-#include <proc_secure.h>
-#include <flask_util.h>
+#include <selinux/selinux.h> /* for is_selinux_enabled() */
#endif
#define PRINT_REAL 1
@@ -61,9 +60,6 @@
gid_t gid;
unsigned long flags;
short status;
-#ifdef CONFIG_SELINUX
- int is_flask_enabled_flag = is_flask_enabled();
-#endif
bb_opt_complementaly = "u~g:g~u";
flags = bb_getopt_ulflags(argc, argv, "rnug");
@@ -109,17 +105,26 @@
putchar(' ');
/* my_getgrgid doesn't exit on failure here */
status|=printf_full(gid, my_getgrgid(NULL, gid, 0), 'g');
+
#ifdef CONFIG_SELINUX
- if(is_flask_enabled_flag) {
- security_id_t mysid = getsecsid();
- char context[80];
- int len = sizeof(context);
- context[0] = '\0';
- if(security_sid_to_context(mysid, context, &len))
- strcpy(context, "unknown");
+ if ( is_selinux_enabled() ) {
+ security_context_t mysid;
+ char context[80];
+ int len = sizeof(context);
+
+ getcon(&mysid);
+ context[0] = '\0';
+ if (mysid) {
+ len = strlen(mysid)+1;
+ safe_strncpy(context, mysid, len);
+ freecon(mysid);
+ }else{
+ safe_strncpy(context, "unknown",8);
+ }
bb_printf(" context=%s", context);
}
#endif
+
putchar('\n');
bb_fflush_stdout_and_exit(status);
}
Modified: trunk/busybox/coreutils/ls.c
===================================================================
--- trunk/busybox/coreutils/ls.c 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/coreutils/ls.c 2005-05-03 06:25:50 UTC (rev 10238)
@@ -64,9 +64,7 @@
#include <sys/sysmacros.h> /* major() and minor() */
#include "busybox.h"
#ifdef CONFIG_SELINUX
-#include <fs_secure.h>
-#include <flask_util.h>
-#include <ss.h>
+#include <selinux/selinux.h> /* for is_selinux_enabled() */
#endif
#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
@@ -182,7 +180,7 @@
char *fullname; /* the dir entry name */
struct stat dstat; /* the file stat info */
#ifdef CONFIG_SELINUX
- security_id_t sid;
+ security_context_t sid;
#endif
struct dnode *next; /* point at the next node */
};
@@ -195,7 +193,7 @@
static unsigned int all_fmt;
#ifdef CONFIG_SELINUX
-static int is_flask_enabled_flag;
+static int selinux_enabled= 0;
#endif
#ifdef CONFIG_FEATURE_AUTOWIDTH
@@ -213,18 +211,19 @@
struct stat dstat;
struct dnode *cur;
#ifdef CONFIG_SELINUX
- security_id_t sid;
+ security_context_t sid=NULL;
#endif
int rc;
#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
if (all_fmt & FOLLOW_LINKS) {
#ifdef CONFIG_SELINUX
- if(is_flask_enabled_flag)
- rc = stat_secure(fullname, &dstat, &sid);
- else
+ if (is_selinux_enabled()) {
+ rc=0; /* Set the number which means success before hand. */
+ rc = getfilecon(fullname,&sid);
+ }
#endif
- rc = stat(fullname, &dstat);
+ rc = stat(fullname, &dstat);
if(rc)
{
bb_perror_msg("%s", fullname);
@@ -235,11 +234,12 @@
#endif
{
#ifdef CONFIG_SELINUX
- if(is_flask_enabled_flag)
- rc = lstat_secure(fullname, &dstat, &sid);
- else
+ if (is_selinux_enabled()) {
+ rc=0; /* Set the number which means success before hand. */
+ rc = lgetfilecon(fullname,&sid);
+ }
#endif
- rc = lstat(fullname, &dstat);
+ rc = lstat(fullname, &dstat);
if(rc)
{
bb_perror_msg("%s", fullname);
@@ -736,12 +736,16 @@
#ifdef CONFIG_SELINUX
case LIST_CONTEXT:
{
- char context[64];
- int len = sizeof(context);
- if(security_sid_to_context(dn->sid, context, &len))
- {
- strcpy(context, "unknown");
- len = 7;
+ char context[80];
+ int len;
+
+ if (dn->sid) {
+ /* I assume sid initilized with NULL */
+ len = strlen(dn->sid)+1;
+ safe_strncpy(context, dn->sid, len);
+ freecon(dn->sid);
+ }else {
+ safe_strncpy(context, "unknown",8);
}
printf("%-32s ", context);
column += MAX(33, len);
@@ -963,10 +967,6 @@
char *terminal_width_str = NULL;
#endif
-#ifdef CONFIG_SELINUX
- is_flask_enabled_flag = is_flask_enabled();
-#endif
-
all_fmt = LIST_SHORT | DISP_NORMAL | STYLE_AUTO
#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
| TIME_MOD
Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/include/libbb.h 2005-05-03 06:25:50 UTC (rev 10238)
@@ -423,11 +423,11 @@
#define FAIL_DELAY 3
extern void change_identity ( const struct passwd *pw );
extern const char *change_identity_e2str ( const struct passwd *pw );
-extern void run_shell ( const char *shell, int loginshell, const char *command, const char **additional_args
+extern void run_shell ( const char *shell, int loginshell, const char *command, const char **additional_args);
#ifdef CONFIG_SELINUX
- , security_context_t sid
-#endif
-);
+extern void renew_current_security_context(void);
+extern void set_current_security_context(security_context_t sid);
+#endif
extern int run_parts(char **args, const unsigned char test_mode, char **env);
extern int restricted_shell ( const char *shell );
extern void setup_environment ( const char *shell, int loginshell, int changeenv, const struct passwd *pw );
@@ -458,11 +458,7 @@
char short_cmd[16];
} procps_status_t;
-extern procps_status_t * procps_scan(int save_user_arg0
-#ifdef CONFIG_SELINUX
- , int use_selinux, security_context_t *sid
-#endif
-);
+extern procps_status_t * procps_scan(int save_user_arg0);
extern unsigned short compare_string_array(const char *string_array[], const char *key);
extern int my_query_module(const char *name, int which, void **buf, size_t *bufsize, size_t *ret);
Modified: trunk/busybox/libbb/find_pid_by_name.c
===================================================================
--- trunk/busybox/libbb/find_pid_by_name.c 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/libbb/find_pid_by_name.c 2005-05-03 06:25:50 UTC (rev 10238)
@@ -45,11 +45,8 @@
procps_status_t * p;
pidList = xmalloc(sizeof(long));
-#ifdef CONFIG_SELINUX
- while ((p = procps_scan(0, 0, NULL)) != 0) {
-#else
- while ((p = procps_scan(0)) != 0) {
-#endif
+ while ((p = procps_scan(0)) != 0)
+ {
if (strncmp(p->short_cmd, pidName, COMM_LEN-1) == 0) {
pidList=xrealloc( pidList, sizeof(long) * (i+2));
pidList[i++]=p->pid;
Modified: trunk/busybox/libbb/procps.c
===================================================================
--- trunk/busybox/libbb/procps.c 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/libbb/procps.c 2005-05-03 06:25:50 UTC (rev 10238)
@@ -16,11 +16,7 @@
#include "libbb.h"
-extern procps_status_t * procps_scan(int save_user_arg0
-#ifdef CONFIG_SELINUX
- , int use_selinux , security_id_t *sid
-#endif
- )
+extern procps_status_t * procps_scan(int save_user_arg0)
{
static DIR *dir;
struct dirent *entry;
@@ -60,16 +56,9 @@
my_getpwuid(curstatus.user, sb.st_uid, sizeof(curstatus.user));
sprintf(status, "/proc/%d/stat", pid);
+
if((fp = fopen(status, "r")) == NULL)
continue;
-#ifdef CONFIG_SELINUX
- if(use_selinux)
- {
- if(fstat_secure(fileno(fp), &sb, sid))
- continue;
- }
- else
-#endif
name = fgets(buf, sizeof(buf), fp);
fclose(fp);
if(name == NULL)
Modified: trunk/busybox/libbb/run_shell.c
===================================================================
--- trunk/busybox/libbb/run_shell.c 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/libbb/run_shell.c 2005-05-03 06:25:50 UTC (rev 10238)
@@ -37,19 +37,41 @@
#include <ctype.h>
#include "libbb.h"
#ifdef CONFIG_SELINUX
-#include <proc_secure.h>
+#include <selinux/selinux.h> /* for setexeccon */
#endif
+#ifdef CONFIG_SELINUX
+static security_context_t current_sid=NULL;
+
+void
+renew_current_security_context(void)
+{
+ if (current_sid)
+ freecon(current_sid); /* Release old context */
+
+ getcon(¤t_sid); /* update */
+
+ return;
+}
+void
+set_current_security_context(security_context_t sid)
+{
+ if (current_sid)
+ freecon(current_sid); /* Release old context */
+
+ current_sid=sid;
+
+ return;
+}
+
+#endif
+
/* Run SHELL, or DEFAULT_SHELL if SHELL is empty.
If COMMAND is nonzero, pass it to the shell with the -c option.
If ADDITIONAL_ARGS is nonzero, pass it to the shell as more
arguments. */
-void run_shell ( const char *shell, int loginshell, const char *command, const char **additional_args
-#ifdef CONFIG_SELINUX
- , security_id_t sid
-#endif
-)
+void run_shell ( const char *shell, int loginshell, const char *command, const char **additional_args)
{
const char **args;
int argno = 1;
@@ -78,10 +100,11 @@
}
args [argno] = 0;
#ifdef CONFIG_SELINUX
- if(sid)
- execve_secure(shell, (char **) args, environ, sid);
- else
+ if ( (current_sid) && (!setexeccon(current_sid)) ) {
+ freecon(current_sid);
+ execve(shell, (char **) args, environ);
+ } else
#endif
- execv ( shell, (char **) args );
+ execv ( shell, (char **) args );
bb_perror_msg_and_die ( "cannot run %s", shell );
}
Modified: trunk/busybox/loginutils/login.c
===================================================================
--- trunk/busybox/loginutils/login.c 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/loginutils/login.c 2005-05-03 06:25:50 UTC (rev 10238)
@@ -17,10 +17,10 @@
#include "busybox.h"
#ifdef CONFIG_SELINUX
-#include <flask_util.h>
-#include <get_sid_list.h>
-#include <proc_secure.h>
-#include <fs_secure.h>
+#include <selinux/selinux.h> /* for is_selinux_enabled() */
+#include <selinux/get_context_list.h> /* for get_default_context() */
+#include <selinux/flask.h> /* for security class definitions */
+#include <errno.h>
#endif
#ifdef CONFIG_FEATURE_U_W_TMP
@@ -79,8 +79,7 @@
char *opt_host = 0;
int alarmstarted = 0;
#ifdef CONFIG_SELINUX
- int flask_enabled = is_flask_enabled();
- security_id_t sid = 0, old_tty_sid, new_tty_sid;
+ security_context_t stat_sid = NULL, sid = NULL, old_tty_sid=NULL, new_tty_sid=NULL;
#endif
username[0]=0;
@@ -225,41 +224,45 @@
#ifdef CONFIG_FEATURE_U_W_TMP
setutmp ( username, tty );
#endif
+
+ if ( *tty != '/' )
+ snprintf ( full_tty, sizeof( full_tty ) - 1, "/dev/%s", tty);
+ else
+ safe_strncpy ( full_tty, tty, sizeof( full_tty ) - 1 );
+
#ifdef CONFIG_SELINUX
- if (flask_enabled)
+ if (is_selinux_enabled())
{
struct stat st;
+ int rc;
- if (get_default_sid(username, 0, &sid))
+ if (get_default_context(username, NULL, &sid))
{
fprintf(stderr, "Unable to get SID for %s\n", username);
exit(1);
}
- if (stat_secure(tty, &st, &old_tty_sid))
+ rc = getfilecon(full_tty,&stat_sid);
+ freecon(stat_sid);
+ if ((rc<0) || (stat(full_tty, &st)<0))
{
- fprintf(stderr, "stat_secure(%.100s) failed: %.100s\n", tty, strerror(errno));
+ fprintf(stderr, "stat_secure(%.100s) failed: %.100s\n", full_tty, strerror(errno));
return EXIT_FAILURE;
}
- if (security_change_sid (sid, old_tty_sid, SECCLASS_CHR_FILE, &new_tty_sid) != 0)
+ if (security_compute_relabel (sid, old_tty_sid, SECCLASS_CHR_FILE, &new_tty_sid) != 0)
{
- fprintf(stderr, "security_change_sid(%.100s) failed: %.100s\n", tty, strerror(errno));
+ fprintf(stderr, "security_change_sid(%.100s) failed: %.100s\n", full_tty, strerror(errno));
return EXIT_FAILURE;
}
- if(chsid(tty, new_tty_sid) != 0)
+ if(setfilecon(full_tty, new_tty_sid) != 0)
{
- fprintf(stderr, "chsid(%.100s, %d) failed: %.100s\n", tty, new_tty_sid, strerror(errno));
+ fprintf(stderr, "chsid(%.100s, %s) failed: %.100s\n", full_tty, new_tty_sid, strerror(errno));
return EXIT_FAILURE;
}
+ freecon(sid);
+ freecon(old_tty_sid);
+ freecon(new_tty_sid);
}
- else
- sid = 0;
#endif
-
- if ( *tty != '/' )
- snprintf ( full_tty, sizeof( full_tty ) - 1, "/dev/%s", tty);
- else
- safe_strncpy ( full_tty, tty, sizeof( full_tty ) - 1 );
-
if ( !is_my_tty ( full_tty ))
syslog ( LOG_ERR, "unable to determine TTY name, got %s\n", full_tty );
@@ -279,11 +282,10 @@
if ( pw-> pw_uid == 0 )
syslog ( LOG_INFO, "root login %s\n", fromhost );
- run_shell ( tmp, 1, 0, 0
#ifdef CONFIG_SELINUX
- , sid
+ set_current_security_context(sid);
#endif
- ); /* exec the shell finally. */
+ run_shell ( tmp, 1, 0, 0); /* exec the shell finally. */
return EXIT_FAILURE;
}
Modified: trunk/busybox/loginutils/su.c
===================================================================
--- trunk/busybox/loginutils/su.c 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/loginutils/su.c 2005-05-03 06:25:50 UTC (rev 10238)
@@ -147,11 +147,10 @@
change_identity ( pw );
setup_environment ( opt_shell, opt_loginshell, !opt_preserve, pw );
- run_shell ( opt_shell, opt_loginshell, opt_command, (const char**)opt_args
#ifdef CONFIG_SELINUX
- , 0
+ set_current_security_context(NULL);
#endif
- );
+ run_shell ( opt_shell, opt_loginshell, opt_command, (const char**)opt_args);
return EXIT_FAILURE;
}
Modified: trunk/busybox/loginutils/sulogin.c
===================================================================
--- trunk/busybox/loginutils/sulogin.c 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/loginutils/sulogin.c 2005-05-03 06:25:50 UTC (rev 10238)
@@ -153,6 +153,12 @@
puts("Entering System Maintenance Mode\n");
fflush(stdout);
syslog(LOG_INFO, "System Maintenance Mode\n");
+
+#ifdef CONFIG_SELINUX
+ renew_current_security_context();
+#endif
+
run_shell(pwent.pw_shell, 1, 0, 0);
+
return (0);
}
Modified: trunk/busybox/procps/ps.c
===================================================================
--- trunk/busybox/procps/ps.c 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/procps/ps.c 2005-05-03 06:25:50 UTC (rev 10238)
@@ -31,9 +31,7 @@
#include <sys/ioctl.h>
#include "busybox.h"
#ifdef CONFIG_SELINUX
-#include <fs_secure.h>
-#include <ss.h>
-#include <flask_util.h> /* for is_flask_enabled() */
+#include <selinux/selinux.h> /* for is_selinux_enabled() */
#endif
static const int TERMINAL_WIDTH = 79; /* not 80 in case terminal has linefold bug */
@@ -48,8 +46,8 @@
#ifdef CONFIG_SELINUX
int use_selinux = 0;
- security_id_t sid;
- if(is_flask_enabled() && argv[1] && !strcmp(argv[1], "-c") )
+ security_context_t sid=NULL;
+ if(is_selinux_enabled() && argv[1] && !strcmp(argv[1], "-c") )
use_selinux = 1;
#endif
@@ -58,34 +56,42 @@
terminal_width--;
#ifdef CONFIG_SELINUX
- if(use_selinux)
- printf(" PID Context Stat Command\n");
+ if (use_selinux)
+ printf(" PID Context Stat Command\n");
else
#endif
- printf(" PID Uid VmSize Stat Command\n");
-#ifdef CONFIG_SELINUX
- while ((p = procps_scan(1, use_selinux, &sid)) != 0) {
-#else
- while ((p = procps_scan(1)) != 0) {
-#endif
+ printf(" PID Uid VmSize Stat Command\n");
+
+ while ((p = procps_scan(1)) != 0) {
char *namecmd = p->cmd;
-
#ifdef CONFIG_SELINUX
- if(use_selinux)
- {
+ if ( use_selinux )
+ {
char sbuf[128];
len = sizeof(sbuf);
- if(security_sid_to_context(sid, (security_context_t)&sbuf, &len))
- strcpy(sbuf, "unknown");
+ if (is_selinux_enabled()) {
+ if (getpidcon(p->pid,&sid)<0)
+ sid=NULL;
+ }
+
+ if (sid) {
+ /* I assume sid initilized with NULL */
+ len = strlen(sid)+1;
+ safe_strncpy(sbuf, sid, len);
+ freecon(sid);
+ sid=NULL;
+ }else {
+ safe_strncpy(sbuf, "unknown",7);
+ }
len = printf("%5d %-32s %s ", p->pid, sbuf, p->state);
- }
+ }
else
#endif
- if(p->rss == 0)
- len = printf("%5d %-8s %s ", p->pid, p->user, p->state);
- else
- len = printf("%5d %-8s %6ld %s ", p->pid, p->user, p->rss, p->state);
+ if(p->rss == 0)
+ len = printf("%5d %-8s %s ", p->pid, p->user, p->state);
+ else
+ len = printf("%5d %-8s %6ld %s ", p->pid, p->user, p->rss, p->state);
i = terminal_width-len;
if(namecmd != 0 && namecmd[0] != 0) {
Modified: trunk/busybox/procps/top.c
===================================================================
--- trunk/busybox/procps/top.c 2005-05-03 05:06:06 UTC (rev 10237)
+++ trunk/busybox/procps/top.c 2005-05-03 06:25:50 UTC (rev 10238)
@@ -510,11 +510,7 @@
/* read process IDs & status for all the processes */
procps_status_t * p;
-#ifdef CONFIG_SELINUX
- while ((p = procps_scan(0, 0, NULL) ) != 0) {
-#else
while ((p = procps_scan(0)) != 0) {
-#endif
int n = ntop;
top = xrealloc(top, (++ntop)*sizeof(procps_status_t));
More information about the busybox-cvs
mailing list