busybox -- SELinux option support for coreutils: ver3
PATCH 7/8 busybox -- SELinux option support for coreutils: ver3
[7/8] busybox-coreutils-07-chcon.v3.patch
- chcon - change security context of file.
chcon.c +216 -0
@@ -0,0 +1,216 @@ +/* +* chcon -- based on coreutils-5.97-13 +* +* Author: ???? +* Port to busybox: KaiGai Kohei <[email protected]> +* +* Copyright (C) 2006 KaiGai Kohei <[email protected]> +*/ +#include "busybox.h" +#include <getopt.h> +#include <selinux/context.h> + +#define OPT_RECURSIVE (1<<0)/* 'R' */ +#define OPT_CHANHES (1<<1)/* 'c' */ +#define OPT_NODEREFERENCE (1<<2)/* 'h' */ +#define OPT_QUIET (1<<3)/* 'f' */ +#define OPT_REFERENCE (1<<4)/* '\n' */ +#define OPT_USER (1<<5)/* 'u' */ +#define OPT_ROLE (1<<6)/* 'r' */ +#define OPT_TYPE (1<<7)/* 't' */ +#define OPT_RANGE (1<<8)/* 'l' */ +#define OPT_VERBOSE (1<<9)/* 'v' */ +#define OPT_COMPONENT_SPECIFIED (OPT_USER | OPT_ROLE | OPT_TYPE | OPT_RANGE) + +static char *user =NULL ; +static char *role =NULL ; +static char *type =NULL ; +static char *range =NULL ; +static char *specified_context =NULL ; + +static int change_dir_context (const char *dir_name,unsigned int opts); + +static context_t compute_context_from_mask (security_context_t context,unsigned int opts) +{ +context_t new_context =context_new (context); +if (!new_context) +return NULL ; + +if ((opts &OPT_USER ) &&context_user_set (new_context, user)) + goto error; +if ((opts &OPT_RANGE ) &&context_range_set (new_context, range)) + goto error; +if ((opts &OPT_ROLE ) &&context_role_set (new_context, role)) + goto error; +if ((opts &OPT_TYPE ) &&context_type_set (new_context, type)) + goto error; + +return new_context; +error: +context_free (new_context); +return NULL ; +} + +static int change_file_context (const char *fname,unsigned long opts) +{ +security_context_t file_context =NULL ; +security_context_t context_string; +context_t context; +int errors =0 ; +int status =0 ; + +if (opts &OPT_NODEREFERENCE ) { + status =lgetfilecon (fname, &file_context); + }else { + status =getfilecon (fname, &file_context); + } +if (status <0 && errno !=ENODATA ) { +if (!(opts &OPT_QUIET ) ==0 ) +bb_error_msg ("could not obtain security context: %s" , fname); +return 1 ; + } + +if (file_context ==NULL && specified_context ==NULL ) { +bb_error_msg ("could not apply partial context to unlabeled file %s" , fname); +return 1 ; + } + +if (specified_context ==NULL ) { + context =compute_context_from_mask (file_context, opts); +if (!context) { +bb_error_msg ("couldn't compute security context from %s" , file_context); +return 1 ; + } + }else { + context =context_new (specified_context); +if (!context) { +bb_error_msg ("invalid context: %s" , specified_context); +return 1 ; + } + } + + context_string =context_str (context); +if (file_context ==NULL ||strcmp (context_string, file_context) !=0 ) { +int fail =0 ; + +if (opts &OPT_NODEREFERENCE ) { + fail =lsetfilecon (fname, context_string); + }else { + fail =setfilecon (fname, context_string); + } +if ((opts &OPT_VERBOSE ) + || ((opts &OPT_CHANHES ) && !fail)) { +printf (!fail + ?"context of %s changed to %s\n" + :"failed to change context of %s to %s\n" , + fname, context_string); + } +if (fail) { + errors =1 ; +if ((opts &OPT_QUIET ) ==0 ) +bb_error_msg ("failed to change context of %s to %s" , + fname, context_string); + } + }else if (opts &OPT_VERBOSE ) { +printf ("context of %s retained as %s\n" , fname, context_string); + } +context_free (context); +freecon (file_context); + +if (opts &OPT_RECURSIVE ) { +struct stat file_stats; +if (lstat (fname, &file_stats) ==0 + &&S_ISDIR (file_stats.st_mode)) + errors |=change_dir_context (fname, opts); + } +return errors; +} + +static int change_dir_context (const char *dir_name,unsigned int opts) +{ +DIR *dir; +struct dirent *dent; +char buffer[PATH_MAX ]; +int len, rc =0 ; + + dir =opendir (dir_name); +if (!dir) { +if (!(opts &OPT_QUIET )) +bb_error_msg ("failed to open directory '%s'" , dir_name); +return 1 ; + } + +while ((dent =readdir (dir))) { +if (!strcmp (dent->d_name,"." ) || !strcmp (dent->d_name,".." )) +continue ; + len =snprintf (buffer,sizeof (buffer),"%s/%s" , dir_name, dent->d_name); +if (len >sizeof (buffer)) { +bb_error_msg ("name too long: %s/%s" , dir_name, dent->d_name); +continue ; + } + rc |=change_file_context (buffer, opts); + } + +closedir (dir); + +return rc; +} + +#ifdef CONFIG_FEATURE_CHCON_LONG_OPTIONS +static struct option chcon_options[] = { + {"recursive" ,0 ,NULL ,'R' }, + {"changes" ,0 ,NULL ,'c' }, + {"no-dereference" ,0 ,NULL ,'h' }, + {"silent" ,0 ,NULL ,'f' }, + {"quiet" ,0 ,NULL ,'f' }, + {"reference" ,1 ,NULL ,'\n' },/* no short option */ + {"user" ,1 ,NULL ,'u' }, + {"role" ,1 ,NULL ,'r' }, + {"type" ,1 ,NULL ,'t' }, + {"range" ,1 ,NULL ,'l' }, + {"verbose" ,0 ,NULL ,'v' }, + {NULL ,0 ,NULL ,0 }, +}; +#endif + +int chcon_main (int argc,char *argv[]); +int chcon_main (int argc,char *argv[]) +{ +char *reference_file; +char **target_files; +int i, opts, errors =0 ; + +#ifdef CONFIG_FEATURE_CHCON_LONG_OPTIONS + applet_long_options = chcon_options; +#endif + opt_complementary ="-1" /* at least 1 param */ +":q--v:v--q" ;/* 'verbose' and 'quiet' are exclusive */ + opts =getopt32 (argc, argv,"Rchf\n:u:r:t:l:v" , + &reference_file, &user, &role, &type, &range); +if (opts &OPT_REFERENCE ) { +if (opts &OPT_COMPONENT_SPECIFIED ) +bb_error_msg_and_die ("conflicting security context specifiers given" ); + +/* FIXME: lgetfilecon() should be used when '-h' is specified. */ +if (getfilecon (reference_file, &specified_context) <0 ) +bb_perror_msg_and_die ("getfilecon('%s') failed" , reference_file); + }else if ((opts &OPT_COMPONENT_SPECIFIED ) ==0 ) { + specified_context = argv[optind++]; +if (!specified_context) +bb_error_msg_and_die ("too few arguments" ); + } + target_files = argv + optind; +if (!target_files[0 ]) +bb_error_msg_and_die ("too few arguments" ); + +for (i=0 ; target_files[i]; i++) { +char *fname = target_files[i]; +int fname_len =strlen (fname); +while (fname_len >1 && fname[fname_len -1 ] =='/' ) + fname_len--; + fname[fname_len] ='\0' ; + errors |=change_file_context (fname, opts); + + } +return errors; +}
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi, Denis.
Thanks for your reviews.
Quoted 43 lines · Denis Vlasenko
Quoted 4 lines · Yuichi Nakamura
[7/8] busybox-coreutils-07-chcon.v3.patch
- chcon - change security context of file.Signed-off-by KaiGai Kohei <[email protected]>(quoted diff) +31
-0+#define OPT_QUIET (1<<3) /* 'f' */ +#define OPT_REFERENCE (1<<4) /* '\n' */ +#define OPT_USER (1<<5) /* 'u' */ + {"quiet", 0, NULL, 'f'}, + {"reference", 1, NULL, '\n' }, /* no short option */ + {"user", 1, NULL, 'u' }, + {"role", 1, NULL, 'r' }, + {"type", 1, NULL, 't' }, + {"range", 1, NULL, 'l' }, + {"verbose", 0, NULL, 'v' }, + {NULL, 0, NULL, 0 }, +}; +#endif + +int chcon_main(int argc, char *argv[]); +int chcon_main(int argc, char *argv[]) +{ + char *reference_file; + char **target_files; + int i, opts, errors = 0; + +#ifdef CONFIG_FEATURE_CHCON_LONG_OPTIONS + applet_long_options = chcon_options; +#endif + opt_complementary = "-1" /* at least 1 param */ + ":q--v:v--q"; /* 'verbose' and 'quiet' are exclusive */ + opts = getopt32(argc, argv, "Rchf\n:u:r:t:l:v", + &reference_file, &user, &role, &type, &range); + if (opts & OPT_REFERENCE) { + if (opts & OPT_COMPONENT_SPECIFIED) + bb_error_msg_and_die("conflicting security context specifiers given");
Quoted 4 lines
Again see
wget.chow to not pass '\n' to getopt32.You can make
OPT_REFERENCEandOPT_COMPONENT_SPECIFIEDexclusive by using suitableopt_complementary.
OK, fixed.
* '\n' was replaced by '0xff'
* Checks for exclusive options were added. chcon applet will will abort if --reference and '-u','-r','-t','-l' are appeared concurrently,
Thanks,
Signature · 1 line
KaiGai Kohei <[email protected]>
chcon.c +214 -0
@@ -0,0 +1,214 @@ +/* +* chcon -- change security context, based on coreutils-5.97-13 +* +* Port to busybox: KaiGai Kohei <[email protected]> +* +* Copyright (C) 2006 - 2007 KaiGai Kohei <[email protected]> +*/ +#include "busybox.h" +#include <getopt.h> +#include <selinux/context.h> + +#define OPT_RECURSIVE (1<<0)/* 'R' */ +#define OPT_CHANHES (1<<1)/* 'c' */ +#define OPT_NODEREFERENCE (1<<2)/* 'h' */ +#define OPT_QUIET (1<<3)/* 'f' */ +#define OPT_REFERENCE (1<<4)/* 0xff */ +#define OPT_USER (1<<5)/* 'u' */ +#define OPT_ROLE (1<<6)/* 'r' */ +#define OPT_TYPE (1<<7)/* 't' */ +#define OPT_RANGE (1<<8)/* 'l' */ +#define OPT_VERBOSE (1<<9)/* 'v' */ +#define OPT_COMPONENT_SPECIFIED (OPT_USER | OPT_ROLE | OPT_TYPE | OPT_RANGE) + +static char *user =NULL ; +static char *role =NULL ; +static char *type =NULL ; +static char *range =NULL ; +static char *specified_context =NULL ; + +static int change_dir_context (const char *dir_name,unsigned int opts); + +static context_t compute_context_from_mask (security_context_t context,unsigned int opts) +{ +context_t new_context =context_new (context); +if (!new_context) +return NULL ; + +if ((opts &OPT_USER ) &&context_user_set (new_context, user)) + goto error; +if ((opts &OPT_RANGE ) &&context_range_set (new_context, range)) + goto error; +if ((opts &OPT_ROLE ) &&context_role_set (new_context, role)) + goto error; +if ((opts &OPT_TYPE ) &&context_type_set (new_context, type)) + goto error; + +return new_context; +error: +context_free (new_context); +return NULL ; +} + +static int change_file_context (const char *fname,unsigned long opts) +{ +security_context_t file_context =NULL ; +security_context_t context_string; +context_t context; +int errors =0 ; +int status =0 ; + +if (opts &OPT_NODEREFERENCE ) { + status =lgetfilecon (fname, &file_context); + }else { + status =getfilecon (fname, &file_context); + } +if (status <0 && errno !=ENODATA ) { +if (!(opts &OPT_QUIET ) ==0 ) +bb_error_msg ("could not obtain security context: %s" , fname); +return 1 ; + } + +if (file_context ==NULL && specified_context ==NULL ) { +bb_error_msg ("could not apply partial context to unlabeled file %s" , fname); +return 1 ; + } + +if (specified_context ==NULL ) { + context =compute_context_from_mask (file_context, opts); +if (!context) { +bb_error_msg ("couldn't compute security context from %s" , file_context); +return 1 ; + } + }else { + context =context_new (specified_context); +if (!context) { +bb_error_msg ("invalid context: %s" , specified_context); +return 1 ; + } + } + + context_string =context_str (context); +if (file_context ==NULL ||strcmp (context_string, file_context) !=0 ) { +int fail =0 ; + +if (opts &OPT_NODEREFERENCE ) { + fail =lsetfilecon (fname, context_string); + }else { + fail =setfilecon (fname, context_string); + } +if ((opts &OPT_VERBOSE ) + || ((opts &OPT_CHANHES ) && !fail)) { +printf (!fail + ?"context of %s changed to %s\n" + :"failed to change context of %s to %s\n" , + fname, context_string); + } +if (fail) { + errors =1 ; +if ((opts &OPT_QUIET ) ==0 ) +bb_error_msg ("failed to change context of %s to %s" , + fname, context_string); + } + }else if (opts &OPT_VERBOSE ) { +printf ("context of %s retained as %s\n" , fname, context_string); + } +context_free (context); +freecon (file_context); + +if (opts &OPT_RECURSIVE ) { +struct stat file_stats; +if (lstat (fname, &file_stats) ==0 + &&S_ISDIR (file_stats.st_mode)) + errors |=change_dir_context (fname, opts); + } +return errors; +} + +static int change_dir_context (const char *dir_name,unsigned int opts) +{ +DIR *dir; +struct dirent *dent; +char buffer[PATH_MAX ]; +int len, rc =0 ; + + dir =opendir (dir_name); +if (!dir) { +if (!(opts &OPT_QUIET )) +bb_error_msg ("failed to open directory '%s'" , dir_name); +return 1 ; + } + +while ((dent =readdir (dir))) { +if (!strcmp (dent->d_name,"." ) || !strcmp (dent->d_name,".." )) +continue ; + len =snprintf (buffer,sizeof (buffer),"%s/%s" , dir_name, dent->d_name); +if (len >sizeof (buffer)) { +bb_error_msg ("name too long: %s/%s" , dir_name, dent->d_name); +continue ; + } + rc |=change_file_context (buffer, opts); + } + +closedir (dir); + +return rc; +} + +#ifdef CONFIG_FEATURE_CHCON_LONG_OPTIONS +static struct option chcon_options[] = { + {"recursive" ,0 ,NULL ,'R' }, + {"changes" ,0 ,NULL ,'c' }, + {"no-dereference" ,0 ,NULL ,'h' }, + {"silent" ,0 ,NULL ,'f' }, + {"quiet" ,0 ,NULL ,'f' }, + {"reference" ,1 ,NULL ,0xff },/* no short option */ + {"user" ,1 ,NULL ,'u' }, + {"role" ,1 ,NULL ,'r' }, + {"type" ,1 ,NULL ,'t' }, + {"range" ,1 ,NULL ,'l' }, + {"verbose" ,0 ,NULL ,'v' }, + {NULL ,0 ,NULL ,0 }, +}; +#endif + +int chcon_main (int argc,char *argv[]); +int chcon_main (int argc,char *argv[]) +{ +char *reference_file; +char **target_files; +int i, opts, errors =0 ; + +#ifdef CONFIG_FEATURE_CHCON_LONG_OPTIONS + applet_long_options = chcon_options; +#endif + opt_complementary ="-1" /* at least 1 param */ +":?:f--v:v--f" /* 'verbose' and 'quiet' are exclusive */ +":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff" ; + opts =getopt32 (argc, argv,"Rchf\xff:u:r:t:l:v" , + &reference_file, &user, &role, &type, &range); +if (opts &OPT_REFERENCE ) { +/* FIXME: lgetfilecon() should be used when '-h' is specified. +But current implementation follows the original one. */ +if (getfilecon (reference_file, &specified_context) <0 ) +bb_perror_msg_and_die ("getfilecon('%s') failed" , reference_file); + }else if ((opts &OPT_COMPONENT_SPECIFIED ) ==0 ) { + specified_context = argv[optind++]; +if (!specified_context) +bb_error_msg_and_die ("too few arguments" ); + } + target_files = argv + optind; +if (!target_files[0 ]) +bb_error_msg_and_die ("too few arguments" ); + +for (i=0 ; target_files[i]; i++) { +char *fname = target_files[i]; +int fname_len =strlen (fname); +while (fname_len >1 && fname[fname_len -1 ] =='/' ) + fname_len--; + fname[fname_len] ='\0' ; + errors |=change_file_context (fname, opts); + + } +return errors; +}
A message that is not in the archive (sent off-list or not yet received): [email protected]
Ver.6 (Re: [PATCH 7/8] busybox -- SELinux option support for coreutils: ver3)
Hello, Thanks for your reviewing.
Quoted 6 lines
Quoted 3 lines
* '\n' was replaced by '
0xff'
* Checks for exclusive options were added. chcon applet will will abort if --reference and '-u','-r','-t','-l' are appeared concurrently,Please move the
change_dir_context()function around to remove the forward decl.
I replaced change_dir_context() function by recursive_action(), not only its declaration.
Quoted 8 lines
(quoted diff) +2
-0+static context_t compute_context_from_mask(security_context_t context, + context_free (new_context);surplus space
Smaller if you goto ret where
ret:return NULL; }
As you say, we can share the above function between runcon and chcon, so I removed the compute_context_from_mask() and added a new function in libbb/selinux_common.c.
See, busybox-coreutils-libbb-09.v6.patch
Quoted 4 lines
(quoted diff) +2
-0+ context_string = context_str(context); + if (file_context == NULL || strcmp(context_string, file_context) != 0) {Can
context_str()return NULL?
Yes, it can return NULL, if malloc() used internally didn't succeed. So, I added the following check:
+ context_string = context_str(context);
+ if (!context_string) {
+ bb_error_msg("couldn't obtain security context in text expression");
+ goto skip;
+ }
Quoted 3 lines
+ int fail = 0;
superfluous set. Remove initialization to 0
Fixed,
Quoted 11 lines
(quoted diff) +9
-0+ + if (opts & OPT_NODEREFERENCE) { + fail = lsetfilecon (fname, context_string); + } else { + fail = setfilecon (fname, context_string); + } + if ((opts & OPT_VERBOSE) + || ((opts & OPT_CHANHES) && !fail)) { + printf(!fail
bb_perror_msg()instead of printf?
bb_perror_msg() prints a message into stderr, although upstreamed chcon prints a message into stdout. It will make an incompatibility. So, I didn't use bb_error_msg() here.
Quoted 9 lines
(quoted diff) +2
-0+ ? "context of %s changed to %s\n" + : "failed to change context of %s to%s\n",
(quoted diff) +2
-0+ fname, context_string); + }
change_dir_context()sounds a bit overdone. Don't we have an opendir wrapper with diagnostics? Perhaps this is a candidate forrecursive_action()
It was replaced by recursive_action().
Quoted 1 line
Manually inlining
compute_context_from_mask()smaller?
It was moved into libbb/selinux_common.o to share with 'runcon'.
Quoted 2 lines
Smaller to resuse the global
option_mask32rather than using opts inchcon_main()?
I replaced any local 'opts' by option_mask32.
Quoted 2 lines
+ ":?:f--v:v--f" /* 'verbose' and 'quiet' are exclusive */
Sounds like there is the word mutual missing.
'-f' is a option for the silent purpose.
It is a definition of upstreamed chcon.
Thanks,
Signature · 1 line
KaiGai Kohei <[email protected]>
libbb.h +3 -0
@@ -41,6 +41,7 @@#if ENABLE_SELINUX #include <selinux/selinux.h> +#include <selinux/context.h> #endif #if ENABLE_LOCALE_SUPPORT
@@ -598,6 +599,8 @@#if ENABLE_SELINUX extern void renew_current_security_context (void );extern void set_current_security_context (security_context_t sid); +extern context_t set_security_context_component (security_context_t cur_context, +char *user,char *role,char *type,char *range);#endif extern void selinux_or_die (void );extern int restricted_shell (const char *shell);
Kbuild +1 -0
@@ -106,6 +106,7 @@ lib-$(CONFIG_LOGIN) += correct_password.o lib-$(CONFIG_DF) += find_mount_point.o lib-$(CONFIG_MKFS_MINIX) += find_mount_point.o +lib-$(CONFIG_SELINUX) += selinux_common.o # We shouldn't build xregcomp.c if we don't need it - this ensures we don't # require regex.h to be in the include dir even if we don't need it thereby
selinux_common.c +30 -0
@@ -0,0 +1,30 @@ +/* +* libbb/selinux_common.c +* -- common SELinux utility functions +* +* Copyright 2007 KaiGai Kohei <[email protected]> +*/ +#include "busybox.h" +#include <selinux/context.h> + +context_t set_security_context_component (security_context_t cur_context, +char *user,char *role,char *type,char *range) +{ +context_t con =context_new (cur_context); +if (!con) +return NULL ; + +if (user &&context_user_set (con, user)) + goto error; +if (type &&context_type_set (con, type)) + goto error; +if (range &&context_range_set (con, range)) + goto error; +if (role &&context_role_set (con, role)) + goto error; +return con; + +error: +context_free (con); +return NULL ; +}
runcon.c +131 -0
131 lines not on this page · raw message
chcon.c +171 -0
171 lines not on this page · raw message