setfiles: Do not abort on labeling error
PATCH v2 1/2 setfiles: Do not abort on labeling error
Commit 602347c7422e ("policycoreutils: setfiles - Modify to use selinux_restorecon") changed behavior of setfiles. Original implementation skipped files which it couldn't set context to while the new implementation aborts on them. setfiles should abort only if it can't validate a context from spec_file.
Reproducer:
# mkdir -p r/1 r/2 r/3
# touch r/1/1 r/2/1
# chattr +i r/2/1
# touch r/3/1
# setfiles -r r -v /etc/selinux/targeted/contexts/files/file_contexts r
Relabeled r from unconfined_u:object_r:mnt_t:s0 to unconfined_u:object_r:root_t:s0
Relabeled r/2 from unconfined_u:object_r:mnt_t:s0 to unconfined_u:object_r:default_t:s0
setfiles: Could not set context for r/2/1: Operation not permittedr/3 and r/1 are not relabeled.
--- policycoreutils/setfiles/setfiles.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
policycoreutils/setfiles/setfiles.c +1 -3
@@ -181,6 +181,7 @@ int main(int argc, char **argv) policyfile =NULL ; nerr =0 ; + r_opts.abort_on_error =0 ; r_opts.progname =strdup (argv[0 ]);if (!r_opts.progname) {fprintf (stderr,"%s: Out of memory!\n" , argv[0 ]);
@@ -193,7 +194,6 @@ int main(int argc, char **argv)* setfiles: * Recursive descent, * Does not expand paths via realpath, -* Aborts on errors during the file tree walk, * Try to track inode associations for conflict detection, * Does not follow mounts (sets SELINUX_RESTORECON_XDEV), * Validates all file contexts at init time.
@@ -201,7 +201,6 @@ int main(int argc, char **argv) iamrestorecon =0 ; r_opts.recurse =SELINUX_RESTORECON_RECURSE ; r_opts.userealpath =0 ;/* SELINUX_RESTORECON_REALPATH */ - r_opts.abort_on_error =SELINUX_RESTORECON_ABORT_ON_ERROR ; r_opts.add_assoc =SELINUX_RESTORECON_ADD_ASSOC ;/* FTS_PHYSICAL and FTS_NOCHDIR are always set by selinux_restorecon(3) */ r_opts.xdev =SELINUX_RESTORECON_XDEV ;
@@ -225,7 +224,6 @@ int main(int argc, char **argv) iamrestorecon =1 ; r_opts.recurse =0 ; r_opts.userealpath =SELINUX_RESTORECON_REALPATH ; - r_opts.abort_on_error =0 ; r_opts.add_assoc =0 ; r_opts.xdev =0 ; r_opts.ignore_mounts =0 ;
Signature · 1 line
2.30.0
PATCH v2 2/2 setfiles: drop ABORT_ON_ERRORS and related code
setfiles -d doesn't have any impact on number of errors before it aborts. It always aborts on first invalid context in spec file.
--- policycoreutils/setfiles/Makefile | 3 --- policycoreutils/setfiles/ru/setfiles.8 | 2 +- policycoreutils/setfiles/setfiles.8 | 3 +-- policycoreutils/setfiles/setfiles.c | 18 ------------------ 4 files changed, 2 insertions(+), 24 deletions(-)
policycoreutils/setfiles/Makefile +0 -3
@@ -5,8 +5,6 @@ SBINDIR ?= /sbin MANDIR = $(PREFIX)/share/man AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) -ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }') - CFLAGS ?= -g -Werror -Wall -W override LDLIBS += -lselinux -lsepol
@@ -26,7 +24,6 @@ restorecon_xattr: restorecon_xattr.o restore.o man: @cp -af setfiles.8 setfiles.8.man - @sed -i "s/ABORT_ON_ERRORS/$(ABORT_ON_ERRORS)/g" setfiles.8.man install: all [ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8
policycoreutils/setfiles/ru/setfiles.8 +1 -1
@@ -47,7 +47,7 @@ setfiles \- установить SELinux-контексты безопаснос проверить действительность контекстов относительно указанной двоичной политики. .TP .B \-d -показать, какая спецификация соответствует каждому из файлов (не прекращать проверку после получения ошибок ABORT_ON_ERRORS). +показать, какая спецификация соответствует каждому из файлов. .TP .BI \-e \ directory исключить каталог (чтобы исключить более одного каталога, этот параметр необходимо использовать соответствующее количество раз).
policycoreutils/setfiles/setfiles.8 +1 -2
@@ -57,8 +57,7 @@ option will force a replacement of the entire context. check the validity of the contexts against the specified binary policy. .TP .B \-d -show what specification matched each file (do not abort validation -after ABORT_ON_ERRORS errors). +show what specification matched each file. .TP .BI \-e \ directory directory to exclude (repeat option for more than one directory).
policycoreutils/setfiles/setfiles.c +0 -18
@@ -23,14 +23,6 @@ static int nerr;#define STAT_BLOCK_SIZE 1 -/* setfiles will abort its operation after reaching the -* following number of errors (e.g. invalid contexts), -* unless it is used in "debug" mode (-d option). -*/ -#ifndef ABORT_ON_ERRORS -#define ABORT_ON_ERRORS 10 -#endif -#define SETFILES "setfiles"#define RESTORECON "restorecon"static int iamrestorecon;
@@ -56,15 +48,6 @@ static __attribute__((__noreturn__)) void usage(const char *const name)exit (-1 ); } -void inc_err (void ) -{ - nerr++; -if (nerr >ABORT_ON_ERRORS -1 && !r_opts.debug) { -fprintf (stderr,"Exiting after %d errors.\n" ,ABORT_ON_ERRORS ); -exit (-1 ); - } -} -void set_rootpath (const char *arg) {if (strlen (arg) ==1 &&strncmp (arg,"/" ,1 ) ==0 ) {
@@ -97,7 +80,6 @@ int canoncon(char **contextp) *contextp = tmpcon; }else if (errno !=ENOENT ) { rc =-1 ; -inc_err (); }return rc;
Signature · 1 line
2.30.0
Re: [PATCH v2 2/2] setfiles: drop ABORT_ON_ERRORS and related code
Quoted 104 lines · Petr Lautrbach
setfiles -ddoesn't have any impact on number of errors before it aborts. It always aborts on first invalid context in spec file.Signed-off-by Petr Lautrbach <[email protected]>--- policycoreutils/setfiles/Makefile | 3 --- policycoreutils/setfiles/ru/setfiles.8 | 2 +- policycoreutils/setfiles/setfiles.8 | 3 +-- policycoreutils/setfiles/setfiles.c | 18 ------------------ 4 files changed, 2 insertions(+), 24 deletions(-)policycoreutils/setfiles/Makefile +0
-3@@ -5,8 +5,6 @@ SBINDIR ?= /sbin MANDIR = $(PREFIX)/share/man AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) -ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }') - CFLAGS ?= -g -Werror -Wall -W override LDLIBS += -lselinux -lsepol@@ -26,7 +24,6 @@ restorecon_xattr: restorecon_xattr.o restore.o man: @cp -af setfiles.8 setfiles.8.man - @sed -i "s/ABORT_ON_ERRORS/$(ABORT_ON_ERRORS)/g" setfiles.8.man install: all [ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8policycoreutils/setfiles/ru/setfiles.8 +1
-1@@ -47,7 +47,7 @@ setfiles \- установить SELinux-контексты безопаснос проверить действительность контекстов относительно указанной двоичной политики. .TP .B \-d -показать, какая спецификация соответствует каждому из файлов (не прекращать проверку после получения ошибок ABORT_ON_ERRORS). +показать, какая спецификация соответствует каждому из файлов. .TP .BI \-e \ directory исключить каталог (чтобы исключить более одного каталога, этот параметр необходимо использовать соответствующее количество раз).policycoreutils/setfiles/setfiles.8 +1
-2@@ -57,8 +57,7 @@ option will force a replacement of the entire context. check the validity of the contexts against the specified binary policy. .TP .B \-d -show what specification matched each file (do not abort validation -after ABORT_ON_ERRORS errors). +show what specification matched each file. .TP .BI \-e \ directory directory to exclude (repeat option for more than one directory).policycoreutils/setfiles/setfiles.c +0
-18@@ -23,14 +23,6 @@ static int nerr;#define STAT_BLOCK_SIZE 1 -/* setfiles will abort its operation after reaching the -* following number of errors (e.g. invalid contexts), -* unless it is used in "debug" mode (-d option). -*/ -#ifndef ABORT_ON_ERRORS -#define ABORT_ON_ERRORS 10 -#endif -#define SETFILES "setfiles"#define RESTORECON "restorecon"static int iamrestorecon;@@ -56,15 +48,6 @@ static __attribute__((__noreturn__)) void usage(const char *const name)exit (-1 ); } -void inc_err (void ) -{ - nerr++; -if (nerr >ABORT_ON_ERRORS -1 && !r_opts.debug) { -fprintf (stderr,"Exiting after %d errors.\n" ,ABORT_ON_ERRORS ); -exit (-1 ); - } -} -void set_rootpath (const char *arg) {if (strlen (arg) ==1 &&strncmp (arg,"/" ,1 ) ==0 ) {@@ -97,7 +80,6 @@ int canoncon(char **contextp) *contextp = tmpcon; }else if (errno !=ENOENT ) { rc =-1 ; -inc_err (); }return rc;Signature · 1 line
2.30.0
If there's no objection I'd like to merge both patches before Wednesday so they'll part of rc2.
A message that is not in the archive (sent off-list or not yet received): CAJfZ7=my52AG+zYMjXJFoxAAHsnJTcs8Y+crbcQ==rT2cWZ-Dg@mail.gmail.com
Re: [PATCH v2 2/2] setfiles: drop ABORT_ON_ERRORS and related code
Quoted 150 lines · Nicolas Iooss
Quoted 104 lines · Petr Lautrbach
Quoted 101 lines · Petr Lautrbach
setfiles -ddoesn't have any impact on number of errors before it aborts. It always aborts on first invalid context in spec file.Signed-off-by Petr Lautrbach <[email protected]>--- policycoreutils/setfiles/Makefile | 3 --- policycoreutils/setfiles/ru/setfiles.8 | 2 +- policycoreutils/setfiles/setfiles.8 | 3 +-- policycoreutils/setfiles/setfiles.c | 18 ------------------ 4 files changed, 2 insertions(+), 24 deletions(-)policycoreutils/setfiles/Makefile +0
-3@@ -5,8 +5,6 @@ SBINDIR ?= /sbin MANDIR = $(PREFIX)/share/man AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) -ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }') - CFLAGS ?= -g -Werror -Wall -W override LDLIBS += -lselinux -lsepol@@ -26,7 +24,6 @@ restorecon_xattr: restorecon_xattr.o restore.o man: @cp -af setfiles.8 setfiles.8.man - @sed -i "s/ABORT_ON_ERRORS/$(ABORT_ON_ERRORS)/g" setfiles.8.man install: all [ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8policycoreutils/setfiles/ru/setfiles.8 +1
-1@@ -47,7 +47,7 @@ setfiles \- установить SELinux-контексты безопаснос проверить действительность контекстов относительно указанной двоичной политики. .TP .B \-d -показать, какая спецификация соответствует каждому из файлов (не прекращать проверку после получения ошибок ABORT_ON_ERRORS). +показать, какая спецификация соответствует каждому из файлов. .TP .BI \-e \ directory исключить каталог (чтобы исключить более одного каталога, этот параметр необходимо использовать соответствующее количество раз).policycoreutils/setfiles/setfiles.8 +1
-2@@ -57,8 +57,7 @@ option will force a replacement of the entire context. check the validity of the contexts against the specified binary policy. .TP .B \-d -show what specification matched each file (do not abort validation -after ABORT_ON_ERRORS errors). +show what specification matched each file. .TP .BI \-e \ directory directory to exclude (repeat option for more than one directory).policycoreutils/setfiles/setfiles.c +0
-18@@ -23,14 +23,6 @@ static int nerr;#define STAT_BLOCK_SIZE 1 -/* setfiles will abort its operation after reaching the -* following number of errors (e.g. invalid contexts), -* unless it is used in "debug" mode (-d option). -*/ -#ifndef ABORT_ON_ERRORS -#define ABORT_ON_ERRORS 10 -#endif -#define SETFILES "setfiles"#define RESTORECON "restorecon"static int iamrestorecon;@@ -56,15 +48,6 @@ static __attribute__((__noreturn__)) void usage(const char *const name)exit (-1 ); } -void inc_err (void ) -{ - nerr++; -if (nerr >ABORT_ON_ERRORS -1 && !r_opts.debug) { -fprintf (stderr,"Exiting after %d errors.\n" ,ABORT_ON_ERRORS ); -exit (-1 ); - } -} -void set_rootpath (const char *arg) {if (strlen (arg) ==1 &&strncmp (arg,"/" ,1 ) ==0 ) {@@ -97,7 +80,6 @@ int canoncon(char **contextp) *contextp = tmpcon; }else if (errno !=ENOENT ) { rc =-1 ; -inc_err (); }Quoted 7 lines
Quoted 3 lines
policycoreutils/setfiles/setfiles.c +0
-1return rc; --2.30.0
If there's no objection I'd like to merge both patches before Wednesday so they'll part of rc2.
I took a look and both patches look good to me. Nevertheless
policycoreutils/setfiles/setfiles.cstil contains a "static int nerr;" which becomes unused, after this patch. This variable should probably be dropped, for example with:policycoreutils/setfiles/setfiles.c +0
-5@@ -19,7 +19,6 @@ static int warn_no_match;static int null_terminated;static int request_digest;static struct restore_opts r_opts; -static int nerr;#define STAT_BLOCK_SIZE 1@@ -161,7 +160,6 @@ int main(int argc, char **argv) warn_no_match =0 ; request_digest =0 ; policyfile =NULL ; - nerr =0 ; r_opts.abort_on_error =0 ; r_opts.progname =strdup (argv[0 ]);@@ -427,9 +425,6 @@ int main(int argc, char **argv) r_opts.selabel_opt_digest = (request_digest ? (char *)1 :NULL ); r_opts.selabel_opt_path = altpath; -if (nerr) -exit (-1 ); -restore_init (&r_opts);if (use_input_file) {
Quoted 2 lines
This clean-up could be done after you merged the patches. So:
Acked-by Nicolas Iooss <[email protected]>
Merged.
Quoted 2 lines
Thanks!
Nicolas