rpms/selinux-policy/devel serefpolicy-2.3.18-iscsi.patch, NONE, 1.1 selinux-policy.spec, 1.311, 1.312

[fedora-cvs-commits at redhat.com]

Author: jantill

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10408

Modified Files:
	selinux-policy.spec 
Added Files:
	serefpolicy-2.3.18-iscsi.patch 
Log Message:
* Tue Oct 10 2006 James Antill <jantill at redhat.com> 2.3.18-9
- Test ISCSI fixes for #209854


serefpolicy-2.3.18-iscsi.patch:
 iscsi.fc  |    2 ++
 iscsi.fc~ |only
 iscsi.te  |   23 ++++++++++++++++++++---
 iscsi.te~ |only
 4 files changed, 22 insertions(+), 3 deletions(-)

--- NEW FILE serefpolicy-2.3.18-iscsi.patch ---
diff -ru serefpolicy-2.3.18-orig/policy/modules/system/iscsi.fc serefpolicy-2.3.18/policy/modules/system/iscsi.fc
--- serefpolicy-2.3.18-orig/policy/modules/system/iscsi.fc	2006-10-10 15:57:37.000000000 -0400
+++ serefpolicy-2.3.18/policy/modules/system/iscsi.fc	2006-10-10 18:11:42.000000000 -0400
@@ -5,3 +5,5 @@
 
 /sbin/iscsid		--	gen_context(system_u:object_r:iscsid_exec_t,s0)
 /var/run/iscsid.pid	--	gen_context(system_u:object_r:iscsi_var_run_t,s0)
+/var/lib/iscsi(/.*)?	--	gen_context(system_u:object_r:iscsi_var_lib_t,s0)
+/var/lock/iscsi(/.*)?	--	gen_context(system_u:object_r:iscsi_lock_t,s0)
Only in serefpolicy-2.3.18/policy/modules/system: iscsi.fc~
diff -ru serefpolicy-2.3.18-orig/policy/modules/system/iscsi.te serefpolicy-2.3.18/policy/modules/system/iscsi.te
--- serefpolicy-2.3.18-orig/policy/modules/system/iscsi.te	2006-10-10 15:57:37.000000000 -0400
+++ serefpolicy-2.3.18/policy/modules/system/iscsi.te	2006-10-12 11:22:48.000000000 -0400
@@ -16,6 +16,11 @@
 type iscsi_var_run_t;
 files_pid_file(iscsi_var_run_t)
 
+type iscsi_var_lib_t;
+files_type(iscsi_var_lib_t)
+
+type iscsi_lock_t;
+files_lock_file(iscsi_lock_t)
 
 ########################################
 #
@@ -30,7 +35,7 @@
 miscfiles_read_localization(iscsid_t)
 ## internal communication is often done using fifo and unix sockets.
 allow iscsid_t self:fifo_file { read write };
-allow iscsid_t self:unix_stream_socket create_stream_socket_perms;
+allow iscsid_t self:unix_stream_socket { create_stream_socket_perms connectto };
 
 ## Networking basics (adjust to your needs!)
 sysnet_dns_name_resolve(iscsid_t)
@@ -44,6 +49,7 @@
 #corenet_tcp_bind_all_ports(iscsid_t)
 #corenet_tcp_bind_all_nodes(iscsid_t)
 allow iscsid_t self:tcp_socket { listen accept };
+allow iscsid_t port_t:tcp_socket name_connect;
 
 # Init script handling
 init_use_fds(iscsid_t)
@@ -54,7 +60,7 @@
 
 allow iscsid_t self:capability { ipc_lock net_admin sys_nice sys_resource };
 allow iscsid_t self:netlink_socket create_socket_perms;
-allow iscsid_t self:netlink_route_socket r_netlink_socket_perms;
+allow iscsid_t self:netlink_route_socket rw_netlink_socket_perms;
 allow iscsid_t self:unix_dgram_socket create_socket_perms;
 
 allow iscsid_t devpts_t:chr_file { read write };
@@ -69,8 +75,19 @@
 allow iscsid_t iscsi_var_run_t:file create_file_perms;
 files_pid_filetrans(iscsid_t,iscsi_var_run_t,file)
 
+allow iscsid_t iscsi_var_lib_t:dir r_dir_perms;
+allow iscsid_t iscsi_var_lib_t:file r_file_perms;
+allow iscsid_t iscsi_var_lib_t:lnk_file { getattr read };
+files_search_var_lib(iscsid_t)
+
+allow iscsid_t iscsi_lock_t:file create_file_perms;
+files_lock_filetrans(iscsid_t,iscsi_lock_t,file)
+# Not right anymore? -- ~J
+# files_search_locks(iscsid_t)
+
 allow iscsid_t iscsi_tmp_t:dir create_dir_perms;
 allow iscsid_t iscsi_tmp_t:file create_file_perms;
 fs_tmpfs_filetrans(iscsid_t, iscsi_tmp_t, file )
 
-files_search_locks(iscsid_t)
+# I hope this is ok - ~J
+allow iscsid_t self:capability dac_override;
Only in serefpolicy-2.3.18/policy/modules/system: iscsi.te~


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- selinux-policy.spec	8 Oct 2006 21:45:47 -0000	1.311
+++ selinux-policy.spec	12 Oct 2006 15:24:06 -0000	1.312
@@ -17,11 +17,12 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.18
-Release: 8
+Release: 10
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
 patch: policy-20060915.patch
+patch2: serefpolicy-2.3.18-iscsi.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -164,6 +165,7 @@
 %prep 
 %setup -q -n serefpolicy-%{version}
 %patch -p1
+%patch2 -p1
 
 %install
 # Build targeted policy
@@ -349,6 +351,9 @@
 %endif
 
 %changelog
+* Tue Oct 10 2006 James Antill <jantill at redhat.com> 2.3.18-9
+- Test ISCSI fixes for #209854
+
 * Sun Oct 8 2006 Dan Walsh <dwalsh at redhat.com> 2.3.18-8
 - allow semodule to rmdir selinux_config_t dir