Skip to content

Commit 14539b4

Browse files
committed
make DONTAUDIT_UNLABELED=y policy load
do not build dontaudit rules on unlabeled_t target type
1 parent 7c6bbdf commit 14539b4

7 files changed

Lines changed: 36 additions & 21 deletions

File tree

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,10 @@ ifeq "$(UBAC)" "y"
215215
M4PARAM += -D enable_ubac
216216
endif
217217

218+
ifeq "$(DONTAUDIT_UNLABELED)" "y"
219+
M4PARAM += -D dontaudit_unlabeled
220+
endif
221+
218222
# default MLS/MCS sensitivity and category settings.
219223
MLS_SENS ?= 16
220224
MLS_CATS ?= 1024

policy/modules/contrib/amanda.te

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ kernel_read_kernel_sysctls(amanda_t)
109109
kernel_read_net_sysctls(amanda_t)
110110
kernel_read_system_state(amanda_t)
111111
kernel_read_network_state(amanda_t)
112-
kernel_dontaudit_getattr_unlabeled_files(amanda_t)
112+
ifdef(`dontaudit_unlabeled',`
113+
kernel_dontaudit_getattr_unlabeled_files(amanda_t)
114+
')
113115
kernel_dontaudit_read_proc_symlinks(amanda_t)
114116

115117
corecmd_exec_shell(amanda_t)

policy/modules/contrib/devicekit.te

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ manage_files_pattern(devicekit_disk_t, devicekit_var_run_t, devicekit_var_run_t)
9090
files_pid_filetrans(devicekit_disk_t, devicekit_var_run_t, { dir file })
9191
files_filetrans_named_content(devicekit_disk_t)
9292

93-
kernel_dontaudit_getattr_unlabeled_files(devicekit_disk_t)
93+
ifdef(`dontaudit_unlabeled',`
94+
kernel_dontaudit_getattr_unlabeled_files(devicekit_disk_t)
95+
')
9496
kernel_getattr_message_if(devicekit_disk_t)
9597
kernel_list_unlabeled(devicekit_disk_t)
9698
kernel_read_fs_sysctls(devicekit_disk_t)

policy/modules/contrib/mplayer.te

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,11 @@ manage_fifo_files_pattern(mplayer_t, mplayer_tmpfs_t, mplayer_tmpfs_t)
146146
manage_sock_files_pattern(mplayer_t, mplayer_tmpfs_t, mplayer_tmpfs_t)
147147
fs_tmpfs_filetrans(mplayer_t, mplayer_tmpfs_t,{ dir file lnk_file sock_file fifo_file })
148148

149-
kernel_dontaudit_list_unlabeled(mplayer_t)
150-
kernel_dontaudit_getattr_unlabeled_files(mplayer_t)
151-
kernel_dontaudit_read_unlabeled_files(mplayer_t)
149+
ifdef(`dontaudit_unlabeled',`
150+
kernel_dontaudit_list_unlabeled(mplayer_t)
151+
kernel_dontaudit_getattr_unlabeled_files(mplayer_t)
152+
kernel_dontaudit_read_unlabeled_files(mplayer_t)
153+
')
152154
kernel_read_system_state(mplayer_t)
153155
kernel_read_kernel_sysctls(mplayer_t)
154156

policy/modules/system/init.te

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1672,8 +1672,9 @@ optional_policy(`
16721672

16731673
optional_policy(`
16741674
# bash tries to access a block device in the initrd
1675-
kernel_dontaudit_getattr_unlabeled_blk_files(initrc_t)
1676-
1675+
ifdef(`dontaudit_unlabeled',`
1676+
kernel_dontaudit_getattr_unlabeled_blk_files(initrc_t)
1677+
')
16771678
# for a bug in rm
16781679
files_dontaudit_write_all_pids(initrc_t)
16791680

policy/modules/system/userdomain.if

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,15 @@ template(`userdom_base_user_template',`
7777

7878
kernel_read_kernel_sysctls($1_usertype)
7979
kernel_read_all_sysctls($1_usertype)
80-
kernel_dontaudit_list_unlabeled($1_usertype)
81-
kernel_dontaudit_getattr_unlabeled_files($1_usertype)
82-
kernel_dontaudit_getattr_unlabeled_symlinks($1_usertype)
83-
kernel_dontaudit_getattr_unlabeled_pipes($1_usertype)
84-
kernel_dontaudit_getattr_unlabeled_sockets($1_usertype)
85-
kernel_dontaudit_getattr_unlabeled_blk_files($1_usertype)
86-
kernel_dontaudit_getattr_unlabeled_chr_files($1_usertype)
80+
ifdef(`dontaudit_unlabeled',`
81+
kernel_dontaudit_list_unlabeled($1_usertype)
82+
kernel_dontaudit_getattr_unlabeled_files($1_usertype)
83+
kernel_dontaudit_getattr_unlabeled_symlinks($1_usertype)
84+
kernel_dontaudit_getattr_unlabeled_pipes($1_usertype)
85+
kernel_dontaudit_getattr_unlabeled_sockets($1_usertype)
86+
kernel_dontaudit_getattr_unlabeled_blk_files($1_usertype)
87+
kernel_dontaudit_getattr_unlabeled_chr_files($1_usertype)
88+
')
8789
kernel_dontaudit_list_proc($1_usertype)
8890

8991
dev_dontaudit_getattr_all_blk_files($1_usertype)

policy/modules/system/userdomain.te

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -572,13 +572,15 @@ application_exec_all(confined_admindomain)
572572

573573
kernel_read_kernel_sysctls(confined_admindomain)
574574
kernel_read_all_sysctls(confined_admindomain)
575-
kernel_dontaudit_list_unlabeled(confined_admindomain)
576-
kernel_dontaudit_getattr_unlabeled_files(confined_admindomain)
577-
kernel_dontaudit_getattr_unlabeled_symlinks(confined_admindomain)
578-
kernel_dontaudit_getattr_unlabeled_pipes(confined_admindomain)
579-
kernel_dontaudit_getattr_unlabeled_sockets(confined_admindomain)
580-
kernel_dontaudit_getattr_unlabeled_blk_files(confined_admindomain)
581-
kernel_dontaudit_getattr_unlabeled_chr_files(confined_admindomain)
575+
ifdef(`dontaudit_unlabeled',`
576+
kernel_dontaudit_list_unlabeled(confined_admindomain)
577+
kernel_dontaudit_getattr_unlabeled_files(confined_admindomain)
578+
kernel_dontaudit_getattr_unlabeled_symlinks(confined_admindomain)
579+
kernel_dontaudit_getattr_unlabeled_pipes(confined_admindomain)
580+
kernel_dontaudit_getattr_unlabeled_sockets(confined_admindomain)
581+
kernel_dontaudit_getattr_unlabeled_blk_files(confined_admindomain)
582+
kernel_dontaudit_getattr_unlabeled_chr_files(confined_admindomain)
583+
')
582584
kernel_dontaudit_list_proc(confined_admindomain)
583585

584586
dev_dontaudit_getattr_all_blk_files(confined_admindomain)

0 commit comments

Comments
 (0)