From 67dffb1bc15786f22443e03ae9c1314f9f1a8462 Mon Sep 17 00:00:00 2001 From: Lukas Vrabec Date: Thu, 9 Feb 2017 23:34:30 +0100 Subject: [PATCH] * Thu Feb 09 2017 Lukas Vrabec - 3.13.1-238 - Allow shiftfs to use xattr SELinux labels - Fix ssh_server_template by add sshd_t to require section. --- container-selinux.tgz | Bin 5812 -> 5805 bytes policy-rawhide-base.patch | 67 +++++++++++++++++++---------------- policy-rawhide-contrib.patch | 9 ++--- selinux-policy.spec | 6 +++- 4 files changed, 46 insertions(+), 36 deletions(-) diff --git a/container-selinux.tgz b/container-selinux.tgz index 60a2978c8593835615f8a2e9d95b0807d6544602..16c13eb8340ad469d4ebb7a7bead58e2735f518e 100644 GIT binary patch delta 5311 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 diff --git a/policy-rawhide-base.patch b/policy-rawhide-base.patch index 6732fd33..c7e4f311 100644 --- a/policy-rawhide-base.patch +++ b/policy-rawhide-base.patch @@ -21474,10 +21474,10 @@ index 8416beb..b38387e 100644 + allow $1 tracefs_t:filesystem unmount; +') diff --git a/policy/modules/kernel/filesystem.te b/policy/modules/kernel/filesystem.te -index e7d1738..59c1cb8 100644 +index e7d1738..b3e6523 100644 --- a/policy/modules/kernel/filesystem.te +++ b/policy/modules/kernel/filesystem.te -@@ -26,14 +26,19 @@ fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0); +@@ -26,14 +26,20 @@ fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0); fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0); fs_use_xattr ext4 gen_context(system_u:object_r:fs_t,s0); fs_use_xattr ext4dev gen_context(system_u:object_r:fs_t,s0); @@ -21494,10 +21494,11 @@ index e7d1738..59c1cb8 100644 +fs_use_xattr squashfs gen_context(system_u:object_r:fs_t,s0); fs_use_xattr zfs gen_context(system_u:object_r:fs_t,s0); +fs_use_xattr fuse.glusterfs gen_context(system_u:object_r:fs_t,s0); ++fs_use_xattr shiftfs gen_context(system_u:object_r:fs_t,s0); # Use the allocating task SID to label inodes in the following filesystem # types, and label the filesystem itself with the specified context. -@@ -53,6 +58,7 @@ type anon_inodefs_t; +@@ -53,6 +59,7 @@ type anon_inodefs_t; fs_type(anon_inodefs_t) files_mountpoint(anon_inodefs_t) genfscon anon_inodefs / gen_context(system_u:object_r:anon_inodefs_t,s0) @@ -21505,7 +21506,7 @@ index e7d1738..59c1cb8 100644 type bdev_t; fs_type(bdev_t) -@@ -63,16 +69,28 @@ fs_type(binfmt_misc_fs_t) +@@ -63,16 +70,28 @@ fs_type(binfmt_misc_fs_t) files_mountpoint(binfmt_misc_fs_t) genfscon binfmt_misc / gen_context(system_u:object_r:binfmt_misc_fs_t,s0) @@ -21535,7 +21536,7 @@ index e7d1738..59c1cb8 100644 type configfs_t; fs_type(configfs_t) -@@ -88,6 +106,11 @@ fs_noxattr_type(ecryptfs_t) +@@ -88,6 +107,11 @@ fs_noxattr_type(ecryptfs_t) files_mountpoint(ecryptfs_t) genfscon ecryptfs / gen_context(system_u:object_r:ecryptfs_t,s0) @@ -21547,7 +21548,7 @@ index e7d1738..59c1cb8 100644 type futexfs_t; fs_type(futexfs_t) genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0) -@@ -96,6 +119,7 @@ type hugetlbfs_t; +@@ -96,6 +120,7 @@ type hugetlbfs_t; fs_type(hugetlbfs_t) files_mountpoint(hugetlbfs_t) fs_use_trans hugetlbfs gen_context(system_u:object_r:hugetlbfs_t,s0); @@ -21555,7 +21556,7 @@ index e7d1738..59c1cb8 100644 type ibmasmfs_t; fs_type(ibmasmfs_t) -@@ -111,6 +135,12 @@ type inotifyfs_t; +@@ -111,6 +136,12 @@ type inotifyfs_t; fs_type(inotifyfs_t) genfscon inotifyfs / gen_context(system_u:object_r:inotifyfs_t,s0) @@ -21568,7 +21569,7 @@ index e7d1738..59c1cb8 100644 type mvfs_t; fs_noxattr_type(mvfs_t) allow mvfs_t self:filesystem associate; -@@ -118,13 +148,23 @@ genfscon mvfs / gen_context(system_u:object_r:mvfs_t,s0) +@@ -118,13 +149,23 @@ genfscon mvfs / gen_context(system_u:object_r:mvfs_t,s0) type nfsd_fs_t; fs_type(nfsd_fs_t) @@ -21593,7 +21594,7 @@ index e7d1738..59c1cb8 100644 fs_type(pstore_t) files_mountpoint(pstore_t) dev_associate_sysfs(pstore_t) -@@ -150,17 +190,16 @@ fs_type(spufs_t) +@@ -150,17 +191,16 @@ fs_type(spufs_t) genfscon spufs / gen_context(system_u:object_r:spufs_t,s0) files_mountpoint(spufs_t) @@ -21615,7 +21616,7 @@ index e7d1738..59c1cb8 100644 type vmblock_t; fs_noxattr_type(vmblock_t) files_mountpoint(vmblock_t) -@@ -172,6 +211,8 @@ type vxfs_t; +@@ -172,6 +212,8 @@ type vxfs_t; fs_noxattr_type(vxfs_t) files_mountpoint(vxfs_t) genfscon vxfs / gen_context(system_u:object_r:vxfs_t,s0) @@ -21624,7 +21625,7 @@ index e7d1738..59c1cb8 100644 # # tmpfs_t is the type for tmpfs filesystems -@@ -182,6 +223,8 @@ fs_type(tmpfs_t) +@@ -182,6 +224,8 @@ fs_type(tmpfs_t) files_type(tmpfs_t) files_mountpoint(tmpfs_t) files_poly_parent(tmpfs_t) @@ -21633,7 +21634,7 @@ index e7d1738..59c1cb8 100644 # Use a transition SID based on the allocating task SID and the # filesystem SID to label inodes in the following filesystem types, -@@ -261,6 +304,8 @@ genfscon udf / gen_context(system_u:object_r:iso9660_t,s0) +@@ -261,6 +305,8 @@ genfscon udf / gen_context(system_u:object_r:iso9660_t,s0) type removable_t; allow removable_t noxattrfs:filesystem associate; fs_noxattr_type(removable_t) @@ -21642,7 +21643,7 @@ index e7d1738..59c1cb8 100644 files_mountpoint(removable_t) # -@@ -280,6 +325,7 @@ genfscon ncpfs / gen_context(system_u:object_r:nfs_t,s0) +@@ -280,6 +326,7 @@ genfscon ncpfs / gen_context(system_u:object_r:nfs_t,s0) genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0) genfscon panfs / gen_context(system_u:object_r:nfs_t,s0) genfscon gadgetfs / gen_context(system_u:object_r:nfs_t,s0) @@ -21650,7 +21651,7 @@ index e7d1738..59c1cb8 100644 ######################################## # -@@ -301,9 +347,10 @@ fs_associate_noxattr(noxattrfs) +@@ -301,9 +348,10 @@ fs_associate_noxattr(noxattrfs) # Unconfined access to this module # @@ -28793,7 +28794,7 @@ index 76d9f66..7528851 100644 +/root/\.ssh(/.*)? gen_context(system_u:object_r:ssh_home_t,s0) +/root/\.shosts gen_context(system_u:object_r:ssh_home_t,s0) diff --git a/policy/modules/services/ssh.if b/policy/modules/services/ssh.if -index fe0c682..d55811f 100644 +index fe0c682..5f4da9d 100644 --- a/policy/modules/services/ssh.if +++ b/policy/modules/services/ssh.if @@ -32,10 +32,11 @@ @@ -28906,16 +28907,20 @@ index fe0c682..d55811f 100644 ####################################### ## ## The template to define a ssh server. -@@ -168,7 +192,7 @@ template(`ssh_basic_client_template',` +@@ -168,7 +192,11 @@ template(`ssh_basic_client_template',` ## ## # -template(`ssh_server_template', ` +template(`ssh_server_template',` ++ gen_require(` ++ type sshd_t; ++ ') ++ type $1_t, ssh_server; auth_login_pgm_domain($1_t) -@@ -181,20 +205,22 @@ template(`ssh_server_template', ` +@@ -181,20 +209,22 @@ template(`ssh_server_template', ` type $1_var_run_t; files_pid_file($1_var_run_t) @@ -28943,7 +28948,7 @@ index fe0c682..d55811f 100644 allow $1_t $1_var_run_t:file manage_file_perms; files_pid_filetrans($1_t, $1_var_run_t, file) -@@ -206,6 +232,7 @@ template(`ssh_server_template', ` +@@ -206,6 +236,7 @@ template(`ssh_server_template', ` kernel_read_kernel_sysctls($1_t) kernel_read_network_state($1_t) @@ -28951,7 +28956,7 @@ index fe0c682..d55811f 100644 corenet_all_recvfrom_unlabeled($1_t) corenet_all_recvfrom_netlabel($1_t) -@@ -220,10 +247,13 @@ template(`ssh_server_template', ` +@@ -220,10 +251,13 @@ template(`ssh_server_template', ` corenet_tcp_bind_generic_node($1_t) corenet_udp_bind_generic_node($1_t) corenet_tcp_bind_ssh_port($1_t) @@ -28967,7 +28972,7 @@ index fe0c682..d55811f 100644 auth_rw_login_records($1_t) auth_rw_faillog($1_t) -@@ -233,7 +263,10 @@ template(`ssh_server_template', ` +@@ -233,7 +267,10 @@ template(`ssh_server_template', ` # for sshd subsystems, such as sftp-server. corecmd_getattr_bin_files($1_t) @@ -28978,7 +28983,7 @@ index fe0c682..d55811f 100644 files_read_etc_files($1_t) files_read_etc_runtime_files($1_t) -@@ -241,35 +274,33 @@ template(`ssh_server_template', ` +@@ -241,35 +278,33 @@ template(`ssh_server_template', ` logging_search_logs($1_t) @@ -29025,7 +29030,7 @@ index fe0c682..d55811f 100644 ') ######################################## -@@ -292,14 +323,15 @@ template(`ssh_server_template', ` +@@ -292,14 +327,15 @@ template(`ssh_server_template', ` ## User domain for the role ## ## @@ -29042,7 +29047,7 @@ index fe0c682..d55811f 100644 ') ############################## -@@ -328,103 +360,56 @@ template(`ssh_role_template',` +@@ -328,103 +364,56 @@ template(`ssh_role_template',` # allow ps to show ssh ps_process_pattern($3, ssh_t) @@ -29156,7 +29161,7 @@ index fe0c682..d55811f 100644 ') ######################################## -@@ -496,8 +481,27 @@ interface(`ssh_read_pipes',` +@@ -496,8 +485,27 @@ interface(`ssh_read_pipes',` type sshd_t; ') @@ -29185,7 +29190,7 @@ index fe0c682..d55811f 100644 ######################################## ## ## Read and write a ssh server unnamed pipe. -@@ -513,7 +517,7 @@ interface(`ssh_rw_pipes',` +@@ -513,7 +521,7 @@ interface(`ssh_rw_pipes',` type sshd_t; ') @@ -29194,7 +29199,7 @@ index fe0c682..d55811f 100644 ') ######################################## -@@ -605,6 +609,24 @@ interface(`ssh_domtrans',` +@@ -605,6 +613,24 @@ interface(`ssh_domtrans',` ######################################## ## @@ -29219,7 +29224,7 @@ index fe0c682..d55811f 100644 ## Execute the ssh client in the caller domain. ## ## -@@ -637,7 +659,7 @@ interface(`ssh_setattr_key_files',` +@@ -637,7 +663,7 @@ interface(`ssh_setattr_key_files',` type sshd_key_t; ') @@ -29228,7 +29233,7 @@ index fe0c682..d55811f 100644 files_search_pids($1) ') -@@ -662,6 +684,42 @@ interface(`ssh_agent_exec',` +@@ -662,6 +688,42 @@ interface(`ssh_agent_exec',` ######################################## ## @@ -29271,7 +29276,7 @@ index fe0c682..d55811f 100644 ## Read ssh home directory content ## ## -@@ -701,6 +759,68 @@ interface(`ssh_domtrans_keygen',` +@@ -701,6 +763,68 @@ interface(`ssh_domtrans_keygen',` ######################################## ## @@ -29340,7 +29345,7 @@ index fe0c682..d55811f 100644 ## Read ssh server keys ## ## -@@ -714,7 +834,26 @@ interface(`ssh_dontaudit_read_server_keys',` +@@ -714,7 +838,26 @@ interface(`ssh_dontaudit_read_server_keys',` type sshd_key_t; ') @@ -29368,7 +29373,7 @@ index fe0c682..d55811f 100644 ') ###################################### -@@ -754,3 +893,151 @@ interface(`ssh_delete_tmp',` +@@ -754,3 +897,151 @@ interface(`ssh_delete_tmp',` files_search_tmp($1) delete_files_pattern($1, sshd_tmp_t, sshd_tmp_t) ') diff --git a/policy-rawhide-contrib.patch b/policy-rawhide-contrib.patch index 326f2f1b..2396b2bb 100644 --- a/policy-rawhide-contrib.patch +++ b/policy-rawhide-contrib.patch @@ -589,7 +589,7 @@ index 058d908..ee0c559 100644 +') + diff --git a/abrt.te b/abrt.te -index eb50f07..d53d1e0 100644 +index eb50f07..def23ab 100644 --- a/abrt.te +++ b/abrt.te @@ -6,11 +6,10 @@ policy_module(abrt, 1.4.1) @@ -1048,7 +1048,7 @@ index eb50f07..d53d1e0 100644 allow abrt_retrace_worker_t self:fifo_file rw_fifo_file_perms; domtrans_pattern(abrt_retrace_worker_t, abrt_retrace_coredump_exec_t, abrt_retrace_coredump_t) -@@ -365,38 +470,79 @@ corecmd_exec_shell(abrt_retrace_worker_t) +@@ -365,38 +470,80 @@ corecmd_exec_shell(abrt_retrace_worker_t) dev_read_urand(abrt_retrace_worker_t) @@ -1100,6 +1100,7 @@ index eb50f07..d53d1e0 100644 +auth_read_passwd(abrt_dump_oops_t) + +corecmd_getattr_all_executables(abrt_dump_oops_t) ++corecmd_exec_bin(abrt_dump_oops_t) + +dev_read_urand(abrt_dump_oops_t) +dev_read_rand(abrt_dump_oops_t) @@ -1132,7 +1133,7 @@ index eb50f07..d53d1e0 100644 ####################################### # -@@ -404,25 +550,60 @@ logging_read_generic_logs(abrt_dump_oops_t) +@@ -404,25 +551,60 @@ logging_read_generic_logs(abrt_dump_oops_t) # allow abrt_watch_log_t self:fifo_file rw_fifo_file_perms; @@ -1195,7 +1196,7 @@ index eb50f07..d53d1e0 100644 ') ####################################### -@@ -430,10 +611,7 @@ tunable_policy(`abrt_upload_watch_anon_write',` +@@ -430,10 +612,7 @@ tunable_policy(`abrt_upload_watch_anon_write',` # Global local policy # diff --git a/selinux-policy.spec b/selinux-policy.spec index ad19431f..217c523b 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -19,7 +19,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.13.1 -Release: 237%{?dist} +Release: 238%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -675,6 +675,10 @@ exit 0 %endif %changelog +* Thu Feb 09 2017 Lukas Vrabec - 3.13.1-238 +- Allow shiftfs to use xattr SELinux labels +- Fix ssh_server_template by add sshd_t to require section. + * Wed Feb 08 2017 Lukas Vrabec - 3.13.1-237 - Merge pull request #187 from rhatdan/container-selinux - Allow rhsmcertd domain signull kernel.