setfiles converted to fts
Subsystems (2)
PATCH v2 1/1 setfiles converted to fts
Here is an updated version of the fts setfiles patch.
I have confirmed that the stat struct that fts returns for a symlink when using the FTS_PHYSICAL flag is in fact the stat struct for the symlink, not the file it points to (st_size is 8 bytes).
Instead of using fts_path for getfilecon/setfilecon it now uses fts_accpath, which should be more efficient since fts walks the file hierarchy for us.
FreeBSD setfsmac uses fts in a similar way to how this patch does and one thing that I took from it was to pass the FTSENT pointer around instead of the names, because although fts_accpath is more efficient for get/setfilecon, it is less helpful in verbose output (fts_path will give the entire path).
Here is the output from running restorecon on /
(nftw version)
restorecon -Rv / 2>/dev/null
restorecon reset /dev/pts/ptmx context system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0
(new version)
./restorecon -Rv / 2>/dev/null
./restorecon reset /dev/pts/ptmx context system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0
Here are some benchmarks each was run twice from a fresh boot in single user mode (shown are the second runs).
(nftw version)
restorecon -Rv /usr
real 1m56.392s
user 1m49.559s
sys 0m6.012s
(new version)
./restorecon -Rv /usr
real 1m55.102s
user 1m50.427s
sys 0m4.656s
So not much of a change, though some work has been pushed from kernel space to user space.
Finally the exclude functionality has been edited to work with fts so that fts will not go down paths that the user wanted to exclude.
We're looking into skipping folders that are mounted under file systems that do not have the seclabel flag for the next patch.
---
Makefile renamed from Makefile.old +1 -2
@@ -3,11 +3,10 @@ PREFIX ?= ${DESTDIR}/usr SBINDIR ?= $(DESTDIR)/sbin MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib - AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) CFLAGS = -Werror -Wall -W -override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include +override CFLAGS += -I$(PREFIX)/include LDLIBS = -lselinux -lsepol -L$(LIBDIR) ifeq (${AUDITH}, /usr/include/libaudit.h)
setfiles.c renamed from setfiles.c.old +59 -107
273 lines not on this page · raw message
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 14 lines · Thomas Liu
Here is an updated version of the fts setfiles patch.
I have confirmed that the stat struct that fts returns for a symlink when using the
FTS_PHYSICALflag is in fact the stat struct for the symlink, not the file it points to (st_sizeis 8 bytes).Instead of using
fts_pathfor getfilecon/setfilecon it now usesfts_accpath, which should be more efficient since fts walks the file hierarchy for us.FreeBSD setfsmac uses fts in a similar way to how this patch does and one thing that I took from it was to pass the FTSENT pointer around instead of the names, because although
fts_accpathis more efficient for get/setfilecon, it is less helpful in verbose output (fts_pathwill give the entire path).
Quoted 5 lines
Here is the output from running restorecon on /
(nftw version)
restorecon -Rv / 2>/dev/null
restorecon reset/dev/pts/ptmxcontext system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0
That's interesting, but for a reason other than your patch. There didn't used to be a /dev/pts/ptmx device, just /dev/ptmx. I guess this came out of the containers work and eventually /dev/ptmx will become a symlink to /dev/pts/ptmx to support per-container ptmx devices? But as devpts is a pseudo filesystem that is dynamically generated, we'll either need to restorecon /dev/pts/ptmx from rc.sysinit or we'll need to somehow make SELinux know that the ptmx node requires different labeling (presently all of /dev/pts uses type transitions for the nodes).
Quoted 341 lines
(new version)
./restorecon -Rv / 2>/dev/null
./restorecon reset/dev/pts/ptmxcontext system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0Here are some benchmarks each was run twice from a fresh boot in single user mode (shown are the second runs).
(nftw version)
restorecon -Rv /usr
real 1m56.392s
user 1m49.559s
sys 0m6.012s(new version)
./restorecon -Rv /usr
real 1m55.102s
user 1m50.427s
sys 0m4.656sSo not much of a change, though some work has been pushed from kernel space to user space.
Finally the exclude functionality has been edited to work with fts so that fts will not go down paths that the user wanted to exclude.
We're looking into skipping folders that are mounted under file systems that do not have the seclabel flag for the next patch.
Signed-off-by Thomas Liu <[email protected]>---
diff -up setfiles/Makefile.old setfiles/MakefileMakefile renamed from Makefile.old +1
-2@@ -3,11 +3,10 @@ PREFIX ?= ${DESTDIR}/usr SBINDIR ?= $(DESTDIR)/sbin MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib - AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) CFLAGS = -Werror -Wall -W -override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include +override CFLAGS += -I$(PREFIX)/include LDLIBS = -lselinux -lsepol -L$(LIBDIR) ifeq (${AUDITH}, /usr/include/libaudit.h)diff -up setfiles/setfiles.c.old
setfiles/setfiles.csetfiles.c renamed from setfiles.c.old +59
-108@@ -12,7 +12,9 @@#include <regex.h> #include <sys/vfs.h> #define __USE_XOPEN_EXTENDED 1/* nftw */ -#include <ftw.h> +#define SKIP -2 +#define ERR -1 +#include <fts.h> #include <limits.h> #include <sepol/sepol.h> #include <selinux/selinux.h> @@ -34,7 +36,6 @@ static int mass_relabel_errs;static FILE *outfile =NULL ;static int force =0 ;#define STAT_BLOCK_SIZE 1 -static int pipe_fds[2 ] = {-1 ,-1 };static int progress =0 ;static unsigned long long count =0 ;@@ -73,7 +74,7 @@ static int iamrestorecon;static int expand_realpath;/* Expand paths via realpath. */ static int abort_on_error;/* Abort the file tree walk upon an error. */ static int add_assoc;/* Track inode associations for conflict detection. */ -static int nftw_flags;/* Flags to nftw, e.g. follow links, follow mounts */ +static int fts_flags;/* Flags to fts, e.g. follow links, follow mounts */ static int ctx_validate;/* Validate contexts */ static const char *altpath;/* Alternate path to file_contexts */ @@ -292,22 +293,10 @@ static int exclude(const char *file)int match (const char *name,struct stat *sb,char **con) { -int ret;char path[PATH_MAX +1 ]; -if (excludeCtr >0 ) { -if (exclude (name)) { -return -1 ; - } - } - ret =lstat (name, sb); -if (ret) { -if (ignore_enoent && errno ==ENOENT ) -return 0 ; -fprintf (stderr,"%s: unable to stat file %s: %s\n" , progname, - name,strerror (errno)); -return -1 ; - } + +if (expand_realpath) {if (S_ISLNK (sb->st_mode)) {@@ -425,22 +414,14 @@ static int only_changed_user(const charreturn (strcmp (rest_a, rest_b) ==0 ); } -static int restore (const char *file) +static int restore (FTSENT *ftsent) { -char *my_file =strdupa (file); -struct stat my_sb; +char *my_file =strdupa (ftsent->fts_path);int ret;char *context, *newcon;int user_only_changed =0 ; -size_t len =strlen (my_file); -/* Skip the extra slashes at the beginning and end, if present. */ -if (file[0 ] =='/' && file[1 ] =='/' ) - my_file++; -if (len >1 && my_file[len -1 ] =='/' ) - my_file[len -1 ] =0 ; - -if (match (my_file, &my_sb, &newcon) <0 ) +if (match (my_file, ftsent->fts_statp, &newcon) <0 )/* Check for no matching specification. */ return (errno ==ENOENT ) ?0 :-1 ;@@ -463,7 +444,7 @@ static int restore(const char *file)* then use the last matching specification. */ if (add_assoc) { - ret =filespec_add (my_sb.st_ino, newcon, my_file); + ret =filespec_add (ftsent->fts_statp->st_ino, newcon, my_file);if (ret <0 ) goto err;@@ -477,7 +458,7 @@ static int restore(const char *file) }/* Get the current context of the file. */ - ret =lgetfilecon_raw (my_file, &context); + ret =lgetfilecon_raw (ftsent->fts_accpath, &context);if (ret <0 ) {if (errno ==ENODATA ) { context =NULL ;@@ -545,46 +526,43 @@ static int restore(const char *file)/* * Relabel the file to the specified context. */ - ret =lsetfilecon (my_file, newcon); + ret =lsetfilecon (ftsent->fts_accpath, newcon);if (ret) {fprintf (stderr,"%s set context %s->%s failed:'%s'\n" , progname, my_file, newcon,strerror (errno)); - goto out; + goto skip; } out:freecon (newcon);return 0 ; + skip: +freecon (newcon); +return SKIP ; + err:freecon (newcon); -return -1 ; +return ERR ; }/* * Apply the last matching specification to a file. -* This function is called by nftw on each file during +* This function is called by fts on each file during * the directory traversal. */ -static int apply_spec (const char *file, -const struct stat *sb_unused __attribute__ ((unused)), -int flag,struct FTW *s_unused __attribute__ ((unused))) -{ -char buf[STAT_BLOCK_SIZE ]; -if (pipe_fds[0 ] !=-1 - &&read (pipe_fds[0 ], buf,STAT_BLOCK_SIZE ) !=STAT_BLOCK_SIZE ) { -fprintf (stderr,"Read error on pipe.\n" ); - pipe_fds[0 ] =-1 ; - } - -if (flag ==FTW_DNR ) { +static int apply_spec (FTSENT *ftsent) +{ +if (ftsent->fts_info ==FTS_DNR ) {fprintf (stderr,"%s: unable to read directory %s\n" , - progname, file); -return 0 ; + progname, ftsent->fts_path); +return SKIP ; } - errors |=restore (file); -if (abort_on_error && errors) -return -1 ; -return 0 ; +int rc =restore (ftsent); +if (rc ==ERR ) { +if (!abort_on_error) +return SKIP ; + } +return rc; }void set_rootpath (const char *arg)@@ -626,67 +604,40 @@ int canoncon(char **contextp)return rc; } -static int pre_stat (const char *file_unused __attribute__ ((unused)), -const struct stat *sb_unused __attribute__ ((unused)), -int flag_unused __attribute__ ((unused)), -struct FTW *s_unused __attribute__ ((unused))) -{ -char buf[STAT_BLOCK_SIZE ]; -if (write (pipe_fds[1 ], buf,STAT_BLOCK_SIZE ) !=STAT_BLOCK_SIZE ) { -fprintf (stderr,"Error writing to stat pipe, child exiting.\n" ); -exit (1 ); - } -return 0 ; -} -static int process_one (char *name) { -struct stat sb; -int rc; - +int rc =0 ; +FTS *fts_handle =NULL ; +const char * namelist[2 ] = {NULL ,NULL }; + namelist[0 ] = name;if (!strcmp (name,"/" )) mass_relabel =1 ; - rc =lstat (name, &sb); -if (rc <0 ) { -if (ignore_enoent && errno ==ENOENT ) -return 0 ; -fprintf (stderr,"%s: stat error on %s: %s\n" , - progname, name,strerror (errno)); +if ((fts_handle =fts_open ((char **)namelist, fts_flags,NULL )) ==NULL ) { +fprintf (stderr, +"%s: error while labeling %s: %s\n" , + progname, namelist[0 ],strerror (errno)); goto err; } -if (S_ISDIR (sb.st_mode) && recurse) { -if (pipe (pipe_fds) <0 ) { -fprintf (stderr,"%s: pipe error on %s: %s\n" , - progname, name,strerror (errno)); - goto err; - } - rc =fork (); -if (rc <0 ) { -fprintf (stderr,"%s: fork error on %s: %s\n" , - progname, name,strerror (errno)); - goto err; - } -if (rc ==0 ) { -/* Child: pre-stat the files. */ -close (pipe_fds[0 ]); -nftw (name, pre_stat,1024 , nftw_flags); -exit (0 ); - } -/* Parent: Check and label the files. */ - rc =0 ; -close (pipe_fds[1 ]); -if (nftw (name, apply_spec,1024 , nftw_flags)) { -fprintf (stderr, -"%s: error while labeling %s: %s\n" , - progname, name,strerror (errno)); - goto err; +FTSENT *ftsent; +while ((ftsent =fts_read (fts_handle)) !=NULL ){ +// Skip the post order nodes. +if (ftsent->fts_info ==FTS_DP ) +continue ; +if (excludeCtr >0 ) { +if (exclude (ftsent->fts_path)) { +fts_set (fts_handle, ftsent,FTS_SKIP ); +continue ; + } } - }else { - rc =restore (name); -if (rc) +int rc =apply_spec (ftsent); +if (rc ==SKIP ) +fts_set (fts_handle, ftsent,FTS_SKIP ); +if (rc ==ERR ) goto err; +if (!recurse) +break ; }if (!strcmp (name,"/" ))@@ -698,8 +649,9 @@ out:filespec_eval ();filespec_destroy (); } - -return rc; +if (fts_handle) +fts_close (fts_handle); +return rc; err:if (!strcmp (name,"/" ))@@ -777,7 +729,7 @@ int main(int argc, char **argv) expand_realpath =0 ; abort_on_error =1 ; add_assoc =1 ; - nftw_flags =FTW_PHYS |FTW_MOUNT ; + fts_flags =FTS_PHYSICAL |FTS_XDEV ; ctx_validate =1 ; }else {/* @@ -796,7 +748,7 @@ int main(int argc, char **argv) expand_realpath =1 ; abort_on_error =0 ; add_assoc =0 ; - nftw_flags =FTW_PHYS ; + fts_flags =FTS_PHYSICAL ; ctx_validate =0 ;/* restorecon only: silent exit if no SELinux. -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 16 lines · Thomas Liu
Here is an updated version of the fts setfiles patch.
I have confirmed that the stat struct that fts returns for a symlink when using the
FTS_PHYSICALflag is in fact the stat struct for the symlink, not the file it points to (st_sizeis 8 bytes).Instead of using
fts_pathfor getfilecon/setfilecon it now usesfts_accpath, which should be more efficient since fts walks the file hierarchy for us.FreeBSD setfsmac uses fts in a similar way to how this patch does and one thing that I took from it was to pass the FTSENT pointer around instead of the names, because although
fts_accpathis more efficient for get/setfilecon, it is less helpful in verbose output (fts_pathwill give the entire path).Here is the output from running restorecon on /
Quoted 7 lines
(nftw version)
restorecon -Rv / 2>/dev/null
restorecon reset/dev/pts/ptmxcontext system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0(new version)
./restorecon -Rv / 2>/dev/null
./restorecon reset/dev/pts/ptmxcontext system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0
I tried invoking it as setfiles, which also checks for multiple hard
links to the same file with conflicting context specifications. And saw
this:
./setfiles -v /etc/selinux/targeted/contexts/files/file_contexts /filespec_add: conflicting specifications for /usr/share/m17n/pa-jhelum.mim and /dev, using system_u:object_r:device_t:s0. ./setfiles reset /nfshome context system_u:object_r:nfs_t:s0->system_u:object_r:default_t:s0 ./setfiles set context /nfshome->system_u:object_r:default_t:s0 failed:'Operation not supported'
filespec_add: conflicting specifications for /boot and /, using system_u:object_r:root_t:s0. filespec_add: conflicting specifications for /etc/grub.conf and /nfshome, using system_u:object_r:default_t:s0. filespec_eval: hash table stats: 339774 elements, 65536/65536 buckets used, longest chain length 6
So something has gone wrong there.
Quoted 337 lines
Here are some benchmarks each was run twice from a fresh boot in single user mode (shown are the second runs).
(nftw version)
restorecon -Rv /usr
real 1m56.392s
user 1m49.559s
sys 0m6.012s(new version)
./restorecon -Rv /usr
real 1m55.102s
user 1m50.427s
sys 0m4.656sSo not much of a change, though some work has been pushed from kernel space to user space.
Finally the exclude functionality has been edited to work with fts so that fts will not go down paths that the user wanted to exclude.
We're looking into skipping folders that are mounted under file systems that do not have the seclabel flag for the next patch.
Signed-off-by Thomas Liu <[email protected]>---
diff -up setfiles/Makefile.old setfiles/MakefileMakefile renamed from Makefile.old +1
-2@@ -3,11 +3,10 @@ PREFIX ?= ${DESTDIR}/usr SBINDIR ?= $(DESTDIR)/sbin MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib - AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) CFLAGS = -Werror -Wall -W -override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include +override CFLAGS += -I$(PREFIX)/include LDLIBS = -lselinux -lsepol -L$(LIBDIR) ifeq (${AUDITH}, /usr/include/libaudit.h)diff -up setfiles/setfiles.c.old
setfiles/setfiles.csetfiles.c renamed from setfiles.c.old +59
-108@@ -12,7 +12,9 @@#include <regex.h> #include <sys/vfs.h> #define __USE_XOPEN_EXTENDED 1/* nftw */ -#include <ftw.h> +#define SKIP -2 +#define ERR -1 +#include <fts.h> #include <limits.h> #include <sepol/sepol.h> #include <selinux/selinux.h> @@ -34,7 +36,6 @@ static int mass_relabel_errs;static FILE *outfile =NULL ;static int force =0 ;#define STAT_BLOCK_SIZE 1 -static int pipe_fds[2 ] = {-1 ,-1 };static int progress =0 ;static unsigned long long count =0 ;@@ -73,7 +74,7 @@ static int iamrestorecon;static int expand_realpath;/* Expand paths via realpath. */ static int abort_on_error;/* Abort the file tree walk upon an error. */ static int add_assoc;/* Track inode associations for conflict detection. */ -static int nftw_flags;/* Flags to nftw, e.g. follow links, follow mounts */ +static int fts_flags;/* Flags to fts, e.g. follow links, follow mounts */ static int ctx_validate;/* Validate contexts */ static const char *altpath;/* Alternate path to file_contexts */ @@ -292,22 +293,10 @@ static int exclude(const char *file)int match (const char *name,struct stat *sb,char **con) { -int ret;char path[PATH_MAX +1 ]; -if (excludeCtr >0 ) { -if (exclude (name)) { -return -1 ; - } - } - ret =lstat (name, sb); -if (ret) { -if (ignore_enoent && errno ==ENOENT ) -return 0 ; -fprintf (stderr,"%s: unable to stat file %s: %s\n" , progname, - name,strerror (errno)); -return -1 ; - } + +if (expand_realpath) {if (S_ISLNK (sb->st_mode)) {@@ -425,22 +414,14 @@ static int only_changed_user(const charreturn (strcmp (rest_a, rest_b) ==0 ); } -static int restore (const char *file) +static int restore (FTSENT *ftsent) { -char *my_file =strdupa (file); -struct stat my_sb; +char *my_file =strdupa (ftsent->fts_path);int ret;char *context, *newcon;int user_only_changed =0 ; -size_t len =strlen (my_file); -/* Skip the extra slashes at the beginning and end, if present. */ -if (file[0 ] =='/' && file[1 ] =='/' ) - my_file++; -if (len >1 && my_file[len -1 ] =='/' ) - my_file[len -1 ] =0 ; - -if (match (my_file, &my_sb, &newcon) <0 ) +if (match (my_file, ftsent->fts_statp, &newcon) <0 )/* Check for no matching specification. */ return (errno ==ENOENT ) ?0 :-1 ;@@ -463,7 +444,7 @@ static int restore(const char *file)* then use the last matching specification. */ if (add_assoc) { - ret =filespec_add (my_sb.st_ino, newcon, my_file); + ret =filespec_add (ftsent->fts_statp->st_ino, newcon, my_file);if (ret <0 ) goto err;@@ -477,7 +458,7 @@ static int restore(const char *file) }/* Get the current context of the file. */ - ret =lgetfilecon_raw (my_file, &context); + ret =lgetfilecon_raw (ftsent->fts_accpath, &context);if (ret <0 ) {if (errno ==ENODATA ) { context =NULL ;@@ -545,46 +526,43 @@ static int restore(const char *file)/* * Relabel the file to the specified context. */ - ret =lsetfilecon (my_file, newcon); + ret =lsetfilecon (ftsent->fts_accpath, newcon);if (ret) {fprintf (stderr,"%s set context %s->%s failed:'%s'\n" , progname, my_file, newcon,strerror (errno)); - goto out; + goto skip; } out:freecon (newcon);return 0 ; + skip: +freecon (newcon); +return SKIP ; + err:freecon (newcon); -return -1 ; +return ERR ; }/* * Apply the last matching specification to a file. -* This function is called by nftw on each file during +* This function is called by fts on each file during * the directory traversal. */ -static int apply_spec (const char *file, -const struct stat *sb_unused __attribute__ ((unused)), -int flag,struct FTW *s_unused __attribute__ ((unused))) -{ -char buf[STAT_BLOCK_SIZE ]; -if (pipe_fds[0 ] !=-1 - &&read (pipe_fds[0 ], buf,STAT_BLOCK_SIZE ) !=STAT_BLOCK_SIZE ) { -fprintf (stderr,"Read error on pipe.\n" ); - pipe_fds[0 ] =-1 ; - } - -if (flag ==FTW_DNR ) { +static int apply_spec (FTSENT *ftsent) +{ +if (ftsent->fts_info ==FTS_DNR ) {fprintf (stderr,"%s: unable to read directory %s\n" , - progname, file); -return 0 ; + progname, ftsent->fts_path); +return SKIP ; } - errors |=restore (file); -if (abort_on_error && errors) -return -1 ; -return 0 ; +int rc =restore (ftsent); +if (rc ==ERR ) { +if (!abort_on_error) +return SKIP ; + } +return rc; }void set_rootpath (const char *arg)@@ -626,67 +604,40 @@ int canoncon(char **contextp)return rc; } -static int pre_stat (const char *file_unused __attribute__ ((unused)), -const struct stat *sb_unused __attribute__ ((unused)), -int flag_unused __attribute__ ((unused)), -struct FTW *s_unused __attribute__ ((unused))) -{ -char buf[STAT_BLOCK_SIZE ]; -if (write (pipe_fds[1 ], buf,STAT_BLOCK_SIZE ) !=STAT_BLOCK_SIZE ) { -fprintf (stderr,"Error writing to stat pipe, child exiting.\n" ); -exit (1 ); - } -return 0 ; -} -static int process_one (char *name) { -struct stat sb; -int rc; - +int rc =0 ; +FTS *fts_handle =NULL ; +const char * namelist[2 ] = {NULL ,NULL }; + namelist[0 ] = name;if (!strcmp (name,"/" )) mass_relabel =1 ; - rc =lstat (name, &sb); -if (rc <0 ) { -if (ignore_enoent && errno ==ENOENT ) -return 0 ; -fprintf (stderr,"%s: stat error on %s: %s\n" , - progname, name,strerror (errno)); +if ((fts_handle =fts_open ((char **)namelist, fts_flags,NULL )) ==NULL ) { +fprintf (stderr, +"%s: error while labeling %s: %s\n" , + progname, namelist[0 ],strerror (errno)); goto err; } -if (S_ISDIR (sb.st_mode) && recurse) { -if (pipe (pipe_fds) <0 ) { -fprintf (stderr,"%s: pipe error on %s: %s\n" , - progname, name,strerror (errno)); - goto err; - } - rc =fork (); -if (rc <0 ) { -fprintf (stderr,"%s: fork error on %s: %s\n" , - progname, name,strerror (errno)); - goto err; - } -if (rc ==0 ) { -/* Child: pre-stat the files. */ -close (pipe_fds[0 ]); -nftw (name, pre_stat,1024 , nftw_flags); -exit (0 ); - } -/* Parent: Check and label the files. */ - rc =0 ; -close (pipe_fds[1 ]); -if (nftw (name, apply_spec,1024 , nftw_flags)) { -fprintf (stderr, -"%s: error while labeling %s: %s\n" , - progname, name,strerror (errno)); - goto err; +FTSENT *ftsent; +while ((ftsent =fts_read (fts_handle)) !=NULL ){ +// Skip the post order nodes. +if (ftsent->fts_info ==FTS_DP ) +continue ; +if (excludeCtr >0 ) { +if (exclude (ftsent->fts_path)) { +fts_set (fts_handle, ftsent,FTS_SKIP ); +continue ; + } } - }else { - rc =restore (name); -if (rc) +int rc =apply_spec (ftsent); +if (rc ==SKIP ) +fts_set (fts_handle, ftsent,FTS_SKIP ); +if (rc ==ERR ) goto err; +if (!recurse) +break ; }if (!strcmp (name,"/" ))@@ -698,8 +649,9 @@ out:filespec_eval ();filespec_destroy (); } - -return rc; +if (fts_handle) +fts_close (fts_handle); +return rc; err:if (!strcmp (name,"/" ))@@ -777,7 +729,7 @@ int main(int argc, char **argv) expand_realpath =0 ; abort_on_error =1 ; add_assoc =1 ; - nftw_flags =FTW_PHYS |FTW_MOUNT ; + fts_flags =FTS_PHYSICAL |FTS_XDEV ; ctx_validate =1 ; }else {/* @@ -796,7 +748,7 @@ int main(int argc, char **argv) expand_realpath =1 ; abort_on_error =0 ; add_assoc =0 ; - nftw_flags =FTW_PHYS ; + fts_flags =FTS_PHYSICAL ; ctx_validate =0 ;/* restorecon only: silent exit if no SELinux. -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 2 lines · Thomas Liu
Here is an updated version of the fts setfiles patch.
<snip>
Quoted 2 lines
We're looking into skipping folders that are mounted under file systems that do not have the seclabel flag for the next patch.
You'll have to make that logic kernel version dependent, as that flag was only introduced in Linux 2.6.30, ala:
#include <sys/utsname.h>
struct utsname uts;
if (uname(&uts) == 0 && strverscmp(uts.release, "2.6.30") >= 0)
use_seclabel = 1;
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
PATCH v3 1/1 setfiles converted to fts
In reply to Stephen SmalleyFirst email didn't go out to the list, sorry.
Here is version 3 of the setfiles to fts patch.
It turns out setting the FTS_XDEV flag tells fts not to descend into directories with different device numbers, but fts will still give back the actual directory. I think nftw would completely avoid the directories as well as their contents.
This patch fixed this issue by saving the device number of the directory that was passed to setfiles and then skipping all action on any directories with a different device number when the FTS_XDEV flag is set.
---
Makefile renamed from Makefile.old +1 -2
@@ -3,11 +3,10 @@ PREFIX ?= ${DESTDIR}/usr SBINDIR ?= $(DESTDIR)/sbin MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib - AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) CFLAGS = -Werror -Wall -W -override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include +override CFLAGS += -I$(PREFIX)/include LDLIBS = -lselinux -lsepol -L$(LIBDIR) ifeq (${AUDITH}, /usr/include/libaudit.h)
setfiles.c renamed from setfiles.c.old +74 -110
289 lines not on this page · raw message
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 4 lines · Thomas Liu
First email didn't go out to the list, sorry.
Here is version 3 of the setfiles to fts patch.
Quoted 8 lines
It turns out setting the
FTS_XDEVflag tells fts not to descend into directories with different device numbers, but fts will still give back the actual directory. I think nftw would completely avoid the directories as well as their contents.This patch fixed this issue by saving the device number of the directory that was passed to setfiles and then skipping all action on any directories with a different device number when the
FTS_XDEVflag is set.
Thanks. For the patch description, we want the original text along with change log for any changes (or changes folded into the original text description as appropriate) so that it gets included in the commit.
Running setfiles -v worked correctly here, although I do note some changes by both the unpatched and patched versions against a vanilla F11, which suggests a policy problem (Dan's issue, not yours).
For the patch, note the following minor cleanups below, and also have a look at the Linux kernel CodingStyle document and checkpatch.pl script, which will warn you about style violations.
Quoted 2 lines
Signed-off-by Thomas Liu <[email protected]>---
Add diffstat -p1 output here so that reviewers can quickly see what files are changed and how large the changes are.
Quoted 15 lines
diff -up setfiles/setfiles.c.old
setfiles/setfiles.csetfiles.c renamed from setfiles.c.old +0
-6@@ -292,22 +293,10 @@ static int exclude(const char *file)int match (const char *name,struct stat *sb,char **con) { -int ret;char path[PATH_MAX +1 ]; -if (excludeCtr >0 ) { -if (exclude (name)) { -return -1 ; - } - }
setfiles.c static int exclude(const char *file) · line 299
Quoted 10 lines
setfiles.c renamed from setfiles.c.old +2
-8- ret =lstat (name, sb); -if (ret) { -if (ignore_enoent && errno ==ENOENT ) -return 0 ; -fprintf (stderr,"%s: unable to stat file %s: %s\n" , progname, - name,strerror (errno)); -return -1 ; - } + +
Remove these additional empty lines, likely artifacts of earlier versions of the patch.
Quoted 10 lines
setfiles.c renamed from setfiles.c.old +2
-3@@ -425,22 +414,14 @@ static int only_changed_user(const charreturn (strcmp (rest_a, rest_b) ==0 ); } -static int restore (const char *file) +static int restore (FTSENT *ftsent) { -char *my_file =strdupa (file); -struct stat my_sb; +char *my_file =strdupa (ftsent->fts_path);
setfiles.c static int only_changed_user(const char · line 441
Quoted 10 lines
setfiles.c renamed from setfiles.c.old +0
-7int ret;char *context, *newcon;int user_only_changed =0 ; -size_t len =strlen (my_file); - -/* Skip the extra slashes at the beginning and end, if present. */ -if (file[0 ] =='/' && file[1 ] =='/' ) - my_file++; -if (len >1 && my_file[len -1 ] =='/' ) - my_file[len -1 ] =0 ;
Not sure why this was added originally, but are you sure it isn't still needed by some callers to remove extraneous slashes?
setfiles.c static int restore(const char *file) · line 448
Quoted 7 lines
setfiles.c renamed from setfiles.c.old +2
-1@@ -463,7 +444,9 @@ static int restore(const char *file)* then use the last matching specification. */ if (add_assoc) { - ret =filespec_add (my_sb.st_ino, newcon, my_file); + +// printf("file: %s, ino: %d\n", my_file, (int)ftsent->fts_statp->st_ino);
Remove debugging printfs.
Quoted 21 lines
setfiles.c renamed from setfiles.c.old +1
-12+ ret =filespec_add (ftsent->fts_statp->st_ino, newcon, my_file);if (ret <0 ) goto err;@@ -626,68 +606,51 @@ int canoncon(char **contextp)return rc; } -static int pre_stat (const char *file_unused __attribute__ ((unused)), -const struct stat *sb_unused __attribute__ ((unused)), -int flag_unused __attribute__ ((unused)), -struct FTW *s_unused __attribute__ ((unused))) -{ -char buf[STAT_BLOCK_SIZE ]; -if (write (pipe_fds[1 ], buf,STAT_BLOCK_SIZE ) !=STAT_BLOCK_SIZE ) { -fprintf (stderr,"Error writing to stat pipe, child exiting.\n" ); -exit (1 ); - } -return 0 ; -}
setfiles.c int canoncon(char **contextp) · line 614
Quoted 10 lines
setfiles.c renamed from setfiles.c.old +4
-4-static int process_one (char *name) { -struct stat sb; -int rc; - +int rc =0 ; +FTS *fts_handle =NULL ; +const char * namelist[2 ] = {NULL ,NULL }; + namelist[0 ] = name;
You can directly handle the assignment in the declaration, right? And put an empty line between local var decls and first statement.
Quoted 40 lines
setfiles.c renamed from setfiles.c.old +4
-31if (!strcmp (name,"/" )) mass_relabel =1 ; - rc =lstat (name, &sb); -if (rc <0 ) { -if (ignore_enoent && errno ==ENOENT ) -return 0 ; -fprintf (stderr,"%s: stat error on %s: %s\n" , - progname, name,strerror (errno)); +if ((fts_handle =fts_open ((char **)namelist, fts_flags,NULL )) ==NULL ) { +fprintf (stderr, +"%s: error while labeling %s: %s\n" , + progname, namelist[0 ],strerror (errno)); goto err; } - -if (S_ISDIR (sb.st_mode) && recurse) { -if (pipe (pipe_fds) <0 ) { -fprintf (stderr,"%s: pipe error on %s: %s\n" , - progname, name,strerror (errno)); - goto err; - } - rc =fork (); -if (rc <0 ) { -fprintf (stderr,"%s: fork error on %s: %s\n" , - progname, name,strerror (errno)); - goto err; - } -if (rc ==0 ) { -/* Child: pre-stat the files. */ -close (pipe_fds[0 ]); -nftw (name, pre_stat,1024 , nftw_flags); -exit (0 ); - } -/* Parent: Check and label the files. */ - rc =0 ; -close (pipe_fds[1 ]); -if (nftw (name, apply_spec,1024 , nftw_flags)) { - fprintf(stderr, - "%s: error while labeling %s: %s\n",
setfiles.c int canoncon(char **contextp) · line 627
Quoted 10 lines
setfiles.c renamed from setfiles.c.old +4
-6- progname, name, strerror(errno)); - goto err; - } - }else { - rc =restore (name); -if (rc) + +dev_t dev_ino =0 ; +FTSENT *ftsent; +// Read the first one
Use C-style comments /* */ rather than C++-style.
Quoted 67 lines
setfiles.c renamed from setfiles.c.old +30
-6+if ((ftsent =fts_read (fts_handle)) !=NULL ){ +// Keep the inode of the first one. + dev_ino = ftsent->fts_statp->st_dev; + } + +do { +// Skip the post order nodes. +if (ftsent->fts_info ==FTS_DP ) +continue ; +// If the XDEV flag is set and the inode is different from the top directory +if (ftsent->fts_statp->st_dev != dev_ino &&FTS_XDEV == (fts_flags &FTS_XDEV )) +continue ; +if (excludeCtr >0 ) { +if (exclude (ftsent->fts_path)) { +fts_set (fts_handle, ftsent,FTS_SKIP ); +continue ; + } + } +int rc =apply_spec (ftsent); +if (rc ==SKIP ) +fts_set (fts_handle, ftsent,FTS_SKIP ); +if (rc ==ERR ) goto err; - } +if (!recurse) +break ; + }while ((ftsent =fts_read (fts_handle)) !=NULL );if (!strcmp (name,"/" )) mass_relabel_errs =0 ;@@ -698,8 +661,9 @@ out:filespec_eval ();filespec_destroy (); } - -return rc; +if (fts_handle) +fts_close (fts_handle); +return rc; err:if (!strcmp (name,"/" ))@@ -777,7 +741,7 @@ int main(int argc, char **argv) expand_realpath =0 ; abort_on_error =1 ; add_assoc =1 ; - nftw_flags =FTW_PHYS |FTW_MOUNT ; + fts_flags =FTS_PHYSICAL |FTS_XDEV ; ctx_validate =1 ; }else {/* @@ -796,7 +760,7 @@ int main(int argc, char **argv) expand_realpath =1 ; abort_on_error =0 ; add_assoc =0 ; - nftw_flags =FTW_PHYS ; + fts_flags =FTS_PHYSICAL ; ctx_validate =0 ;/* restorecon only: silent exit if no SELinux. -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
PATCH v4 1/1 setfiles converted to fts
This is version 4 of the setfiles to fts patch.
The code has been cleaned up to adhere to the CodingStyle guidelines.
I have confirmed that the stat struct that fts returns for a symlink when using the FTS_PHYSICAL flag is in fact the stat struct for the symlink, not the file it points to (st_size is 8 bytes).
Instead of using fts_path for getfilecon/setfilecon it now uses fts_accpath, which should be more efficient since fts walks the file hierarchy for us.
FreeBSD setfsmac uses fts in a similar way to how this patch does and one thing that I took from it was to pass the FTSENT pointer around instead of the names, because although fts_accpath is more efficient for get/setfilecon, it is less helpful in verbose output (fts_path will give the entire path).
Here is the output from running restorecon on /
(nftw version)
restorecon -Rv / 2>/dev/null
restorecon reset /dev/pts/ptmx context system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0
(new version)
./restorecon -Rv / 2>/dev/null
./restorecon reset /dev/pts/ptmx context system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0
Here are some benchmarks each was run twice from a fresh boot in single user mode (shown are the second runs).
(nftw version)
restorecon -Rv /usr
real 1m56.392s
user 1m49.559s
sys 0m6.012s
(new version)
./restorecon -Rv /usr
real 1m55.102s
user 1m50.427s
sys 0m4.656s
So not much of a change, though some work has been pushed from kernel space to user space.
It turns out setting the FTS_XDEV flag tells fts not to descend into directories with different device numbers, but fts will still give back the actual directory. I think nftw would completely avoid the directories as well as their contents.
This patch fixed this issue by saving the device number of the directory that was passed to setfiles and then skipping all action on any directories with a different device number when the FTS_XDEV flag is set.
Also removed some code that removed beginning and trailing slashes from paths, since fts seems to handle it.
---
diffstat -p1 setfiles_v4.patchMakefile | 2setfiles.c | 179 +++++++++++++++++++++++--------------------------------------
2 files changed, 69 insertions(+), 112 deletions(-)
Makefile +1 -1
@@ -3,11 +3,10 @@ PREFIX ?= ${DESTDIR}/usr SBINDIR ?= $(DESTDIR)/sbin MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) CFLAGS = -Werror -Wall -W -override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include +override CFLAGS += -I$(PREFIX)/include LDLIBS = -lselinux -lsepol -L$(LIBDIR) ifeq (${AUDITH}, /usr/include/libaudit.h)
setfiles.c +68 -111
283 lines not on this page · raw message
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 1 line · Thomas Liu
This is version 4 of the setfiles to fts patch.
Looks good, but the patch was whitespace damaged. Also, it isn't -p1 appliable from the root of the source tree. Use git diff if possible.
Quoted 380 lines
The code has been cleaned up to adhere to the CodingStyle guidelines.
I have confirmed that the stat struct that fts returns for a symlink when using the
FTS_PHYSICALflag is in fact the stat struct for the symlink, not the file it points to (st_sizeis 8 bytes).Instead of using
fts_pathfor getfilecon/setfilecon it now usesfts_accpath, which should be more efficient since fts walks the file hierarchy for us.FreeBSD setfsmac uses fts in a similar way to how this patch does and one thing that I took from it was to pass the FTSENT pointer around instead of the names, because although
fts_accpathis more efficient for get/setfilecon, it is less helpful in verbose output (fts_pathwill give the entire path).Here is the output from running restorecon on /
(nftw version)
restorecon -Rv / 2>/dev/null
restorecon reset/dev/pts/ptmxcontext system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0(new version)
./restorecon -Rv / 2>/dev/null
./restorecon reset/dev/pts/ptmxcontext system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0Here are some benchmarks each was run twice from a fresh boot in single user mode (shown are the second runs).
(nftw version)
restorecon -Rv /usr
real 1m56.392s
user 1m49.559s
sys 0m6.012s(new version)
./restorecon -Rv /usr
real 1m55.102s
user 1m50.427s
sys 0m4.656sSo not much of a change, though some work has been pushed from kernel space to user space.
It turns out setting the
FTS_XDEVflag tells fts not to descend into directories with different device numbers, but fts will still give back the actual directory. I think nftw would completely avoid the directories as well as their contents.This patch fixed this issue by saving the device number of the directory that was passed to setfiles and then skipping all action on any directories with a different device number when the
FTS_XDEVflag is set.Also removed some code that removed beginning and trailing slashes from paths, since fts seems to handle it.
Signed-off-by Thomas Liu <[email protected]>---
diffstat -p1 setfiles_v4.patchMakefile| 2setfiles.c| 179 +++++++++++++++++++++++--------------------------------------2 files changed, 69 insertions(+), 112 deletions(-)diff -uprN setfiles_vanilla/Makefile setfiles/Makefile
Makefile +1
-1@@ -3,11 +3,10 @@ PREFIX ?= ${DESTDIR}/usr SBINDIR ?= $(DESTDIR)/sbin MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) CFLAGS = -Werror -Wall -W -override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include +override CFLAGS += -I$(PREFIX)/include LDLIBS = -lselinux -lsepol -L$(LIBDIR) ifeq (${AUDITH}, /usr/include/libaudit.h)diff -uprN
setfiles_vanilla/setfiles.csetfiles/setfiles.csetfiles.c +68
-112@@ -12,7 +12,9 @@#include <regex.h> #include <sys/vfs.h> #define __USE_XOPEN_EXTENDED 1/* nftw */ -#include <ftw.h> +#define SKIP -2 +#define ERR -1 +#include <fts.h> #include <limits.h> #include <sepol/sepol.h> #include <selinux/selinux.h> @@ -34,7 +36,6 @@ static int mass_relabel_errs;static FILE *outfile =NULL ;static int force =0 ;#define STAT_BLOCK_SIZE 1 -static int pipe_fds[2 ] = {-1 ,-1 };static int progress =0 ;static unsigned long long count =0 ;@@ -73,7 +74,7 @@ static int iamrestorecon;static int expand_realpath;/* Expand paths via realpath. */ static int abort_on_error;/* Abort the file tree walk upon an error. */ static int add_assoc;/* Track inode associations for conflict detection. */ -static int nftw_flags;/* Flags to nftw, e.g. follow links, follow mounts */ +static int fts_flags;/* Flags to fts, e.g. follow links, follow mounts */ static int ctx_validate;/* Validate contexts */ static const char *altpath;/* Alternate path to file_contexts */ @@ -292,23 +293,8 @@ static int exclude(const char *file)int match (const char *name,struct stat *sb,char **con) { -int ret;char path[PATH_MAX +1 ]; -if (excludeCtr >0 ) { -if (exclude (name)) { -return -1 ; - } - } - ret =lstat (name, sb); -if (ret) { -if (ignore_enoent && errno ==ENOENT ) -return 0 ; -fprintf (stderr,"%s: unable to stat file %s: %s\n" , progname, - name,strerror (errno)); -return -1 ; - } -if (expand_realpath) {if (S_ISLNK (sb->st_mode)) {if (verbose >1 )@@ -425,22 +411,14 @@ static int only_changed_user(const charreturn (strcmp (rest_a, rest_b) ==0 ); } -static int restore (const char *file) +static int restore (FTSENT *ftsent) { -char *my_file =strdupa (file); -struct stat my_sb; +char *my_file =strdupa (ftsent->fts_path);int ret;char *context, *newcon;int user_only_changed =0 ; -size_t len =strlen (my_file); - -/* Skip the extra slashes at the beginning and end, if present. */ -if (file[0 ] =='/' && file[1 ] =='/' ) - my_file++; -if (len >1 && my_file[len -1 ] =='/' ) - my_file[len -1 ] =0 ; -if (match (my_file, &my_sb, &newcon) <0 ) +if (match (my_file, ftsent->fts_statp, &newcon) <0 )/* Check for no matching specification. */ return (errno ==ENOENT ) ?0 :-1 ;@@ -463,7 +441,7 @@ static int restore(const char *file)* then use the last matching specification. */ if (add_assoc) { - ret =filespec_add (my_sb.st_ino, newcon, my_file); + ret =filespec_add (ftsent->fts_statp->st_ino, newcon, my_file);if (ret <0 ) goto err;@@ -477,7 +455,7 @@ static int restore(const char *file) }/* Get the current context of the file. */ - ret =lgetfilecon_raw (my_file, &context); + ret =lgetfilecon_raw (ftsent->fts_accpath, &context);if (ret <0 ) {if (errno ==ENODATA ) { context =NULL ;@@ -545,46 +523,42 @@ static int restore(const char *file)/* * Relabel the file to the specified context. */ - ret =lsetfilecon (my_file, newcon); + ret =lsetfilecon (ftsent->fts_accpath, newcon);if (ret) {fprintf (stderr,"%s set context %s->%s failed:'%s'\n" , progname, my_file, newcon,strerror (errno)); - goto out; + goto skip; } - out: +out:freecon (newcon);return 0 ; - err: +skip:freecon (newcon); -return -1 ; +return SKIP ; +err: +freecon (newcon); +return ERR ; }/* * Apply the last matching specification to a file. -* This function is called by nftw on each file during +* This function is called by fts on each file during * the directory traversal. */ -static int apply_spec (const char *file, -const struct stat *sb_unused __attribute__ ((unused)), -int flag,struct FTW *s_unused __attribute__ ((unused))) -{ -char buf[STAT_BLOCK_SIZE ]; -if (pipe_fds[0 ] !=-1 - &&read (pipe_fds[0 ], buf,STAT_BLOCK_SIZE ) !=STAT_BLOCK_SIZE ) { -fprintf (stderr,"Read error on pipe.\n" ); - pipe_fds[0 ] =-1 ; - } - -if (flag ==FTW_DNR ) { +static int apply_spec (FTSENT *ftsent) +{ +if (ftsent->fts_info ==FTS_DNR ) {fprintf (stderr,"%s: unable to read directory %s\n" , - progname, file); -return 0 ; + progname, ftsent->fts_path); +return SKIP ; } - errors |=restore (file); -if (abort_on_error && errors) -return -1 ; -return 0 ; +int rc =restore (ftsent); +if (rc ==ERR ) { +if (!abort_on_error) +return SKIP ; + } +return rc; }void set_rootpath (const char *arg)@@ -626,68 +600,50 @@ int canoncon(char **contextp)return rc; } -static int pre_stat (const char *file_unused __attribute__ ((unused)), -const struct stat *sb_unused __attribute__ ((unused)), -int flag_unused __attribute__ ((unused)), -struct FTW *s_unused __attribute__ ((unused))) -{ -char buf[STAT_BLOCK_SIZE ]; -if (write (pipe_fds[1 ], buf,STAT_BLOCK_SIZE ) !=STAT_BLOCK_SIZE ) { -fprintf (stderr,"Error writing to stat pipe, child exiting.\n" ); -exit (1 ); - } -return 0 ; -} -static int process_one (char *name) { -struct stat sb; -int rc; +int rc =0 ; +const char *namelist[2 ] = {name,NULL };if (!strcmp (name,"/" )) mass_relabel =1 ; - - rc =lstat (name, &sb); -if (rc <0 ) { -if (ignore_enoent && errno ==ENOENT ) -return 0 ; -fprintf (stderr,"%s: stat error on %s: %s\n" , - progname, name,strerror (errno)); +FTS *fts_handle =fts_open ((char **)namelist, fts_flags,NULL ); +if (fts_handle ==NULL ) { +fprintf (stderr, +"%s: error while labeling %s: %s\n" , + progname, namelist[0 ],strerror (errno)); goto err; } -if (S_ISDIR (sb.st_mode) && recurse) { -if (pipe (pipe_fds) <0 ) { -fprintf (stderr,"%s: pipe error on %s: %s\n" , - progname, name,strerror (errno)); +dev_t dev_num =0 ; +FTSENT *ftsent =fts_read (fts_handle); +if (ftsent !=NULL ) { +/* Keep the inode of the first one. */ + dev_num = ftsent->fts_statp->st_dev; + } + +do { +/* Skip the post order nodes. */ +if (ftsent->fts_info ==FTS_DP ) +continue ; +/* If the XDEV flag is set and the device is different */ +if (ftsent->fts_statp->st_dev != dev_num && +FTS_XDEV == (fts_flags &FTS_XDEV )) +continue ; +if (excludeCtr >0 ) { +if (exclude (ftsent->fts_path)) { +fts_set (fts_handle, ftsent,FTS_SKIP ); +continue ; + } + } +int rc =apply_spec (ftsent); +if (rc ==SKIP ) +fts_set (fts_handle, ftsent,FTS_SKIP ); +if (rc ==ERR ) goto err; - } - rc =fork (); -if (rc <0 ) { -fprintf (stderr,"%s: fork error on %s: %s\n" , - progname, name,strerror (errno)); - goto err; - } -if (rc ==0 ) { -/* Child: pre-stat the files. */ -close (pipe_fds[0 ]); -nftw (name, pre_stat,1024 , nftw_flags); -exit (0 ); - } -/* Parent: Check and label the files. */ - rc =0 ; -close (pipe_fds[1 ]); -if (nftw (name, apply_spec,1024 , nftw_flags)) { -fprintf (stderr, -"%s: error while labeling %s: %s\n" , - progname, name,strerror (errno)); - goto err; - } - }else { - rc =restore (name); -if (rc) - goto err; - } +if (!recurse) +break ; + }while ((ftsent =fts_read (fts_handle)) !=NULL );if (!strcmp (name,"/" )) mass_relabel_errs =0 ;@@ -698,7 +654,8 @@ out:filespec_eval ();filespec_destroy (); } - +if (fts_handle) +fts_close (fts_handle);return rc; err:@@ -777,7 +734,7 @@ int main(int argc, char **argv) expand_realpath =0 ; abort_on_error =1 ; add_assoc =1 ; - nftw_flags =FTW_PHYS |FTW_MOUNT ; + fts_flags =FTS_PHYSICAL |FTS_XDEV ; ctx_validate =1 ; }else {/* @@ -796,7 +753,7 @@ int main(int argc, char **argv) expand_realpath =1 ; abort_on_error =0 ; add_assoc =0 ; - nftw_flags =FTW_PHYS ; + fts_flags =FTS_PHYSICAL ; ctx_validate =0 ;/* restorecon only: silent exit if no SELinux. -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
PATCH v5 1/1 setfiles converted to fts
This is version 5 of the setfiles to fts patch.
The code has been cleaned up to adhere to the CodingStyle guidelines.
I have confirmed that the stat struct that fts returns for a symlink when using the FTS_PHYSICAL flag is in fact the stat struct for the symlink, not the file it points to (st_size is 8 bytes).
Instead of using fts_path for getfilecon/setfilecon it now uses fts_accpath, which should be more efficient since fts walks the file hierarchy for us.
FreeBSD setfsmac uses fts in a similar way to how this patch does and one thing that I took from it was to pass the FTSENT pointer around instead of the names, because although fts_accpath is more efficient for get/setfilecon, it is less helpful in verbose output (fts_path will give the entire path).
Here is the output from running restorecon on /
(nftw version)
restorecon -Rv / 2>/dev/null
restorecon reset /dev/pts/ptmx context system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0
(new version)
./restorecon -Rv / 2>/dev/null
./restorecon reset /dev/pts/ptmx context system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0
Here are some benchmarks each was run twice from a fresh boot in single user mode (shown are the second runs).
(nftw version)
restorecon -Rv /usr
real 1m56.392s
user 1m49.559s
sys 0m6.012s
(new version)
./restorecon -Rv /usr
real 1m55.102s
user 1m50.427s
sys 0m4.656s
So not much of a change, though some work has been pushed from kernel space to user space.
It turns out setting the FTS_XDEV flag tells fts not to descend into directories with different device numbers, but fts will still give back the actual directory. I think nftw would completely avoid the directories as well as their contents.
This patch fixed this issue by saving the device number of the directory that was passed to setfiles and then skipping all action on any directories with a different device number when the FTS_XDEV flag is set.
Also removed some code that removed beginning and trailing slashes from paths, since fts seems to handle it.
---
Sending again due to whitespace damage, also used git diff so that the patch is p1 appliable.
diffstat -p1 setfiles_v5.patchMakefile | 2setfiles.c | 179 +++++++++++++++++++++++--------------------------------------
2 files changed, 69 insertions(+), 112 deletions(-)
setfiles/Makefile renamed from setfiles_vanilla/Makefile +1 -2
@@ -3,11 +3,10 @@ PREFIX ?= ${DESTDIR}/usr SBINDIR ?= $(DESTDIR)/sbin MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib - AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) CFLAGS = -Werror -Wall -W -override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include +override CFLAGS += -I$(PREFIX)/include LDLIBS = -lselinux -lsepol -L$(LIBDIR) ifeq (${AUDITH}, /usr/include/libaudit.h)
setfiles/setfiles.c renamed from setfiles_vanilla/setfiles.c +66 -109
281 lines not on this page · raw message
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 53 lines · Thomas Liu
This is version 5 of the setfiles to fts patch.
The code has been cleaned up to adhere to the CodingStyle guidelines.
I have confirmed that the stat struct that fts returns for a symlink when using the
FTS_PHYSICALflag is in fact the stat struct for the symlink, not the file it points to (st_sizeis 8 bytes).Instead of using
fts_pathfor getfilecon/setfilecon it now usesfts_accpath, which should be more efficient since fts walks the file hierarchy for us.FreeBSD setfsmac uses fts in a similar way to how this patch does and one thing that I took from it was to pass the FTSENT pointer around instead of the names, because although
fts_accpathis more efficient for get/setfilecon, it is less helpful in verbose output (fts_pathwill give the entire path).Here is the output from running restorecon on /
(nftw version)
restorecon -Rv / 2>/dev/null
restorecon reset/dev/pts/ptmxcontext system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0(new version)
./restorecon -Rv / 2>/dev/null
./restorecon reset/dev/pts/ptmxcontext system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0Here are some benchmarks each was run twice from a fresh boot in single user mode (shown are the second runs).
(nftw version)
restorecon -Rv /usr
real 1m56.392s
user 1m49.559s
sys 0m6.012s(new version)
./restorecon -Rv /usr
real 1m55.102s
user 1m50.427s
sys 0m4.656sSo not much of a change, though some work has been pushed from kernel space to user space.
It turns out setting the
FTS_XDEVflag tells fts not to descend into directories with different device numbers, but fts will still give back the actual directory. I think nftw would completely avoid the directories as well as their contents.This patch fixed this issue by saving the device number of the directory that was passed to setfiles and then skipping all action on any directories with a different device number when the
FTS_XDEVflag is set.
Quoted 7 lines
Also removed some code that removed beginning and trailing slashes from paths, since fts seems to handle it.
Signed-off-by Thomas Liu <[email protected]>---
Sending again due to whitespace damage, also used git diff so that the patch is p1 appliable.
I meant relative to the root of the git repo, e.g. git clone http://oss.tresys.com/git/selinux.git
cd selinux/policycoreutils
<apply your patch>
git diff
But that's ok. Looks fine to me, although I would have preferred that the local var decls go at the beginning of the function.
Quoted 318 lines
diffstat -p1 setfiles_v5.patch
Makefile| 2setfiles.c| 179 +++++++++++++++++++++++--------------------------------------2 files changed, 69 insertions(+), 112 deletions(-)setfiles/Makefile renamed from setfiles_vanilla/Makefile +1
-2@@ -3,11 +3,10 @@ PREFIX ?= ${DESTDIR}/usr SBINDIR ?= $(DESTDIR)/sbin MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib - AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) CFLAGS = -Werror -Wall -W -override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include +override CFLAGS += -I$(PREFIX)/include LDLIBS = -lselinux -lsepol -L$(LIBDIR) ifeq (${AUDITH}, /usr/include/libaudit.h)setfiles/setfiles.c renamed from setfiles_vanilla/setfiles.c +66
-109@@ -12,7 +12,9 @@#include <regex.h> #include <sys/vfs.h> #define __USE_XOPEN_EXTENDED 1/* nftw */ -#include <ftw.h> +#define SKIP -2 +#define ERR -1 +#include <fts.h> #include <limits.h> #include <sepol/sepol.h> #include <selinux/selinux.h> @@ -34,7 +36,6 @@ static int mass_relabel_errs;static FILE *outfile =NULL ;static int force =0 ;#define STAT_BLOCK_SIZE 1 -static int pipe_fds[2 ] = {-1 ,-1 };static int progress =0 ;static unsigned long long count =0 ;@@ -73,7 +74,7 @@ static int iamrestorecon;static int expand_realpath;/* Expand paths via realpath. */ static int abort_on_error;/* Abort the file tree walk upon an error. */ static int add_assoc;/* Track inode associations for conflict detection. */ -static int nftw_flags;/* Flags to nftw, e.g. follow links, follow mounts */ +static int fts_flags;/* Flags to fts, e.g. follow links, follow mounts */ static int ctx_validate;/* Validate contexts */ static const char *altpath;/* Alternate path to file_contexts */ @@ -292,23 +293,8 @@ static int exclude(const char *file)int match (const char *name,struct stat *sb,char **con) { -int ret;char path[PATH_MAX +1 ]; -if (excludeCtr >0 ) { -if (exclude (name)) { -return -1 ; - } - } - ret =lstat (name, sb); -if (ret) { -if (ignore_enoent && errno ==ENOENT ) -return 0 ; -fprintf (stderr,"%s: unable to stat file %s: %s\n" , progname, - name,strerror (errno)); -return -1 ; - } -if (expand_realpath) {if (S_ISLNK (sb->st_mode)) {if (verbose >1 )@@ -425,22 +411,14 @@ static int only_changed_user(const char *a, const char *b)return (strcmp (rest_a, rest_b) ==0 ); } -static int restore (const char *file) +static int restore (FTSENT *ftsent) { -char *my_file =strdupa (file); -struct stat my_sb; +char *my_file =strdupa (ftsent->fts_path);int ret;char *context, *newcon;int user_only_changed =0 ; -size_t len =strlen (my_file); - -/* Skip the extra slashes at the beginning and end, if present. */ -if (file[0 ] =='/' && file[1 ] =='/' ) - my_file++; -if (len >1 && my_file[len -1 ] =='/' ) - my_file[len -1 ] =0 ; -if (match (my_file, &my_sb, &newcon) <0 ) +if (match (my_file, ftsent->fts_statp, &newcon) <0 )/* Check for no matching specification. */ return (errno ==ENOENT ) ?0 :-1 ;@@ -463,7 +441,7 @@ static int restore(const char *file)* then use the last matching specification. */ if (add_assoc) { - ret =filespec_add (my_sb.st_ino, newcon, my_file); + ret =filespec_add (ftsent->fts_statp->st_ino, newcon, my_file);if (ret <0 ) goto err;@@ -477,7 +455,7 @@ static int restore(const char *file) }/* Get the current context of the file. */ - ret =lgetfilecon_raw (my_file, &context); + ret =lgetfilecon_raw (ftsent->fts_accpath, &context);if (ret <0 ) {if (errno ==ENODATA ) { context =NULL ;@@ -545,46 +523,42 @@ static int restore(const char *file)/* * Relabel the file to the specified context. */ - ret =lsetfilecon (my_file, newcon); + ret =lsetfilecon (ftsent->fts_accpath, newcon);if (ret) {fprintf (stderr,"%s set context %s->%s failed:'%s'\n" , progname, my_file, newcon,strerror (errno)); - goto out; + goto skip; } - out: +out:freecon (newcon);return 0 ; - err: +skip:freecon (newcon); -return -1 ; +return SKIP ; +err: +freecon (newcon); +return ERR ; }/* * Apply the last matching specification to a file. -* This function is called by nftw on each file during +* This function is called by fts on each file during * the directory traversal. */ -static int apply_spec (const char *file, -const struct stat *sb_unused __attribute__ ((unused)), -int flag,struct FTW *s_unused __attribute__ ((unused))) +static int apply_spec (FTSENT *ftsent) { -char buf[STAT_BLOCK_SIZE ]; -if (pipe_fds[0 ] !=-1 - &&read (pipe_fds[0 ], buf,STAT_BLOCK_SIZE ) !=STAT_BLOCK_SIZE ) { -fprintf (stderr,"Read error on pipe.\n" ); - pipe_fds[0 ] =-1 ; - } - -if (flag ==FTW_DNR ) { +if (ftsent->fts_info ==FTS_DNR ) {fprintf (stderr,"%s: unable to read directory %s\n" , - progname, file); -return 0 ; + progname, ftsent->fts_path); +return SKIP ; } - errors |=restore (file); -if (abort_on_error && errors) -return -1 ; -return 0 ; +int rc =restore (ftsent); +if (rc ==ERR ) { +if (!abort_on_error) +return SKIP ; + } +return rc; }void set_rootpath (const char *arg)@@ -626,68 +600,50 @@ int canoncon(char **contextp)return rc; } -static int pre_stat (const char *file_unused __attribute__ ((unused)), -const struct stat *sb_unused __attribute__ ((unused)), -int flag_unused __attribute__ ((unused)), -struct FTW *s_unused __attribute__ ((unused))) -{ -char buf[STAT_BLOCK_SIZE ]; -if (write (pipe_fds[1 ], buf,STAT_BLOCK_SIZE ) !=STAT_BLOCK_SIZE ) { -fprintf (stderr,"Error writing to stat pipe, child exiting.\n" ); -exit (1 ); - } -return 0 ; -} -static int process_one (char *name) { -struct stat sb; -int rc; +int rc =0 ; +const char *namelist[2 ] = {name,NULL };if (!strcmp (name,"/" )) mass_relabel =1 ; - - rc =lstat (name, &sb); -if (rc <0 ) { -if (ignore_enoent && errno ==ENOENT ) -return 0 ; -fprintf (stderr,"%s: stat error on %s: %s\n" , - progname, name,strerror (errno)); +FTS *fts_handle =fts_open ((char **)namelist, fts_flags,NULL ); +if (fts_handle ==NULL ) { +fprintf (stderr, +"%s: error while labeling %s: %s\n" , + progname, namelist[0 ],strerror (errno)); goto err; } -if (S_ISDIR (sb.st_mode) && recurse) { -if (pipe (pipe_fds) <0 ) { -fprintf (stderr,"%s: pipe error on %s: %s\n" , - progname, name,strerror (errno)); - goto err; - } - rc =fork (); -if (rc <0 ) { -fprintf (stderr,"%s: fork error on %s: %s\n" , - progname, name,strerror (errno)); - goto err; - } -if (rc ==0 ) { -/* Child: pre-stat the files. */ -close (pipe_fds[0 ]); -nftw (name, pre_stat,1024 , nftw_flags); -exit (0 ); - } -/* Parent: Check and label the files. */ - rc =0 ; -close (pipe_fds[1 ]); -if (nftw (name, apply_spec,1024 , nftw_flags)) { -fprintf (stderr, -"%s: error while labeling %s: %s\n" , - progname, name,strerror (errno)); - goto err; +dev_t dev_num =0 ; +FTSENT *ftsent =fts_read (fts_handle); +if (ftsent !=NULL ) { +/* Keep the inode of the first one. */ + dev_num = ftsent->fts_statp->st_dev; + } + +do { +/* Skip the post order nodes. */ +if (ftsent->fts_info ==FTS_DP ) +continue ; +/* If the XDEV flag is set and the device is different */ +if (ftsent->fts_statp->st_dev != dev_num && +FTS_XDEV == (fts_flags &FTS_XDEV )) +continue ; +if (excludeCtr >0 ) { +if (exclude (ftsent->fts_path)) { +fts_set (fts_handle, ftsent,FTS_SKIP ); +continue ; + } } - }else { - rc =restore (name); -if (rc) +int rc =apply_spec (ftsent); +if (rc ==SKIP ) +fts_set (fts_handle, ftsent,FTS_SKIP ); +if (rc ==ERR ) goto err; - } +if (!recurse) +break ; + }while ((ftsent =fts_read (fts_handle)) !=NULL );if (!strcmp (name,"/" )) mass_relabel_errs =0 ;@@ -698,7 +654,8 @@ out:filespec_eval ();filespec_destroy (); } - +if (fts_handle) +fts_close (fts_handle);return rc; err:@@ -777,7 +734,7 @@ int main(int argc, char **argv) expand_realpath =0 ; abort_on_error =1 ; add_assoc =1 ; - nftw_flags =FTW_PHYS |FTW_MOUNT ; + fts_flags =FTS_PHYSICAL |FTS_XDEV ; ctx_validate =1 ; }else {/* @@ -796,7 +753,7 @@ int main(int argc, char **argv) expand_realpath =1 ; abort_on_error =0 ; add_assoc =0 ; - nftw_flags =FTW_PHYS ; + fts_flags =FTS_PHYSICAL ; ctx_validate =0 ;/* restorecon only: silent exit if no SELinux.
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 68 lines · Stephen Smalley
Quoted 53 lines · Thomas Liu
This is version 5 of the setfiles to fts patch.
The code has been cleaned up to adhere to the CodingStyle guidelines.
I have confirmed that the stat struct that fts returns for a symlink when using the
FTS_PHYSICALflag is in fact the stat struct for the symlink, not the file it points to (st_sizeis 8 bytes).Instead of using
fts_pathfor getfilecon/setfilecon it now usesfts_accpath, which should be more efficient since fts walks the file hierarchy for us.FreeBSD setfsmac uses fts in a similar way to how this patch does and one thing that I took from it was to pass the FTSENT pointer around instead of the names, because although
fts_accpathis more efficient for get/setfilecon, it is less helpful in verbose output (fts_pathwill give the entire path).Here is the output from running restorecon on /
(nftw version)
restorecon -Rv / 2>/dev/null
restorecon reset/dev/pts/ptmxcontext system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0(new version)
./restorecon -Rv / 2>/dev/null
./restorecon reset/dev/pts/ptmxcontext system_u:object_r:devpts_t:s0->system_u:object_r:ptmx_t:s0Here are some benchmarks each was run twice from a fresh boot in single user mode (shown are the second runs).
(nftw version)
restorecon -Rv /usr
real 1m56.392s
user 1m49.559s
sys 0m6.012s(new version)
./restorecon -Rv /usr
real 1m55.102s
user 1m50.427s
sys 0m4.656sSo not much of a change, though some work has been pushed from kernel space to user space.
It turns out setting the
FTS_XDEVflag tells fts not to descend into directories with different device numbers, but fts will still give back the actual directory. I think nftw would completely avoid the directories as well as their contents.This patch fixed this issue by saving the device number of the directory that was passed to setfiles and then skipping all action on any directories with a different device number when the
FTS_XDEVflag is set.Quoted 7 lines
Also removed some code that removed beginning and trailing slashes from paths, since fts seems to handle it.
Signed-off-by Thomas Liu <[email protected]>---
Sending again due to whitespace damage, also used git diff so that the patch is p1 appliable.I meant relative to the root of the git repo, e.g. git clone http://oss.tresys.com/git/selinux.git
cd selinux/policycoreutils
<apply your patch>
git diff
Quoted 4 lines
But that's ok. Looks fine to me, although I would have preferred that the local var decls go at the beginning of the function.
Acked-by Stephen Smalley <[email protected]>
Merged with a change to move up those local var decls in policycoreutils 2.0.66. Thanks!
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.