diff --git a/policy-f20-base.patch b/policy-f20-base.patch index 741c176..0e47a2d 100644 --- a/policy-f20-base.patch +++ b/policy-f20-base.patch @@ -4086,7 +4086,7 @@ index f9b25c1..9af1f7a 100644 +/usr/lib/udev/devices/ppp -c gen_context(system_u:object_r:ppp_device_t,s0) +/usr/lib/udev/devices/net/.* -c gen_context(system_u:object_r:tun_tap_device_t,s0) diff --git a/policy/modules/kernel/corenetwork.if.in b/policy/modules/kernel/corenetwork.if.in -index 07126bd..38ba47d 100644 +index 07126bd..015bd7a 100644 --- a/policy/modules/kernel/corenetwork.if.in +++ b/policy/modules/kernel/corenetwork.if.in @@ -55,6 +55,7 @@ interface(`corenet_reserved_port',` @@ -4698,26 +4698,10 @@ index 07126bd..38ba47d 100644 ## Send and receive TCP network traffic on all reserved ports. ## ## -@@ -1757,7 +2129,259 @@ interface(`corenet_udp_receive_all_reserved_ports',` +@@ -1772,6 +2144,25 @@ interface(`corenet_udp_sendrecv_all_reserved_ports',` ######################################## ## --## Send and receive UDP network traffic on all reserved ports. -+## Send and receive UDP network traffic on all reserved ports. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`corenet_udp_sendrecv_all_reserved_ports',` -+ corenet_udp_send_all_reserved_ports($1) -+ corenet_udp_receive_all_reserved_ports($1) -+') -+ -+######################################## -+## +## Bind DCCP sockets to all reserved ports. +## +## @@ -4737,19 +4721,15 @@ index 07126bd..38ba47d 100644 + +######################################## +## -+## Bind TCP sockets to all reserved ports. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`corenet_tcp_bind_all_reserved_ports',` -+ gen_require(` -+ attribute reserved_port_type; -+ ') -+ + ## Bind TCP sockets to all reserved ports. + ## + ## +@@ -1785,31 +2176,284 @@ interface(`corenet_tcp_bind_all_reserved_ports',` + attribute reserved_port_type; + ') + +- allow $1 reserved_port_type:tcp_socket name_bind; +- allow $1 self:capability net_bind_service; + allow $1 reserved_port_type:tcp_socket name_bind; + allow $1 self:capability net_bind_service; +') @@ -4865,6 +4845,24 @@ index 07126bd..38ba47d 100644 + +######################################## +## ++## Bind TCP sockets to all ports > 1024. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`corenet_tcp_bind_unreserved_ports',` ++ gen_require(` ++ attribute unreserved_port_t; ++ ') ++ ++ allow $1 unreserved_port_t:tcp_socket name_bind; ++') ++ ++######################################## ++## +## Bind UDP sockets to all ports > 1024. +## +## @@ -4956,50 +4954,36 @@ index 07126bd..38ba47d 100644 +######################################## +## +## Connect DCCP sockets to all ports > 1024. - ## - ## - ## -@@ -1765,51 +2389,53 @@ interface(`corenet_udp_receive_all_reserved_ports',` - ## - ## - # --interface(`corenet_udp_sendrecv_all_reserved_ports',` -- corenet_udp_send_all_reserved_ports($1) -- corenet_udp_receive_all_reserved_ports($1) ++## ++## ++## ++## Domain allowed access. ++## ++## ++# +interface(`corenet_dccp_connect_all_unreserved_ports',` + gen_require(` + attribute unreserved_port_type; + ') + + allow $1 unreserved_port_type:dccp_socket name_connect; - ') - --######################################## ++') ++ +####################################### - ## --## Bind TCP sockets to all reserved ports. ++## +## Connect TCP sockets to ports > 1024. - ## - ## --## --## Domain allowed access. --## ++## ++## +## +## Domain allowed access. +## - ## - # --interface(`corenet_tcp_bind_all_reserved_ports',` -- gen_require(` -- attribute reserved_port_type; -- ') ++## ++# +interface(`corenet_tcp_connect_unreserved_ports',` + gen_require(` + type unreserved_port_t; + ') - -- allow $1 reserved_port_type:tcp_socket name_bind; -- allow $1 self:capability net_bind_service; ++ + allow $1 unreserved_port_t:tcp_socket name_connect; ') @@ -5033,7 +5017,7 @@ index 07126bd..38ba47d 100644 ## ## ## -@@ -1817,18 +2443,18 @@ interface(`corenet_dontaudit_tcp_bind_all_reserved_ports',` +@@ -1817,18 +2461,18 @@ interface(`corenet_dontaudit_tcp_bind_all_reserved_ports',` ## ## # @@ -5057,7 +5041,7 @@ index 07126bd..38ba47d 100644 ## ## ## -@@ -1836,35 +2462,36 @@ interface(`corenet_udp_bind_all_reserved_ports',` +@@ -1836,35 +2480,36 @@ interface(`corenet_udp_bind_all_reserved_ports',` ## ## # @@ -5102,7 +5086,7 @@ index 07126bd..38ba47d 100644 ## ## ## -@@ -1872,17 +2499,17 @@ interface(`corenet_tcp_bind_all_unreserved_ports',` +@@ -1872,17 +2517,17 @@ interface(`corenet_tcp_bind_all_unreserved_ports',` ## ## # @@ -5124,7 +5108,7 @@ index 07126bd..38ba47d 100644 ## ## ## -@@ -1890,36 +2517,37 @@ interface(`corenet_udp_bind_all_unreserved_ports',` +@@ -1890,36 +2535,37 @@ interface(`corenet_udp_bind_all_unreserved_ports',` ## ## # @@ -5171,7 +5155,7 @@ index 07126bd..38ba47d 100644 ## ## ## -@@ -1927,54 +2555,54 @@ interface(`corenet_tcp_connect_all_unreserved_ports',` +@@ -1927,54 +2573,54 @@ interface(`corenet_tcp_connect_all_unreserved_ports',` ## ## # @@ -5241,7 +5225,7 @@ index 07126bd..38ba47d 100644 ## ## ## -@@ -1982,13 +2610,12 @@ interface(`corenet_dontaudit_tcp_connect_all_rpc_ports',` +@@ -1982,13 +2628,12 @@ interface(`corenet_dontaudit_tcp_connect_all_rpc_ports',` ## ## # @@ -5257,7 +5241,7 @@ index 07126bd..38ba47d 100644 ') ######################################## -@@ -2049,6 +2676,25 @@ interface(`corenet_rw_ppp_dev',` +@@ -2049,6 +2694,25 @@ interface(`corenet_rw_ppp_dev',` ######################################## ## @@ -5283,7 +5267,7 @@ index 07126bd..38ba47d 100644 ## Bind TCP sockets to all RPC ports. ## ## -@@ -2068,6 +2714,24 @@ interface(`corenet_tcp_bind_all_rpc_ports',` +@@ -2068,6 +2732,24 @@ interface(`corenet_tcp_bind_all_rpc_ports',` ######################################## ## @@ -5308,7 +5292,7 @@ index 07126bd..38ba47d 100644 ## Do not audit attempts to bind TCP sockets to all RPC ports. ## ## -@@ -2194,6 +2858,25 @@ interface(`corenet_tcp_recv_netlabel',` +@@ -2194,6 +2876,25 @@ interface(`corenet_tcp_recv_netlabel',` ######################################## ## @@ -5334,7 +5318,7 @@ index 07126bd..38ba47d 100644 ## Receive TCP packets from a NetLabel connection. ## ## -@@ -2213,7 +2896,7 @@ interface(`corenet_tcp_recvfrom_netlabel',` +@@ -2213,7 +2914,7 @@ interface(`corenet_tcp_recvfrom_netlabel',` ######################################## ## @@ -5343,7 +5327,7 @@ index 07126bd..38ba47d 100644 ## ## ## -@@ -2221,10 +2904,15 @@ interface(`corenet_tcp_recvfrom_netlabel',` +@@ -2221,10 +2922,15 @@ interface(`corenet_tcp_recvfrom_netlabel',` ## ## # @@ -5361,7 +5345,7 @@ index 07126bd..38ba47d 100644 # XXX - at some point the oubound/send access check will be removed # but for right now we need to keep this in place so as not to break # older systems -@@ -2249,6 +2937,26 @@ interface(`corenet_dontaudit_tcp_recv_netlabel',` +@@ -2249,6 +2955,26 @@ interface(`corenet_dontaudit_tcp_recv_netlabel',` ######################################## ## @@ -5388,7 +5372,7 @@ index 07126bd..38ba47d 100644 ## Do not audit attempts to receive TCP packets from a NetLabel ## connection. ## -@@ -2269,6 +2977,27 @@ interface(`corenet_dontaudit_tcp_recvfrom_netlabel',` +@@ -2269,6 +2995,27 @@ interface(`corenet_dontaudit_tcp_recvfrom_netlabel',` ######################################## ## @@ -5416,7 +5400,7 @@ index 07126bd..38ba47d 100644 ## Do not audit attempts to receive TCP packets from an unlabeled ## connection. ## -@@ -2533,15 +3262,10 @@ interface(`corenet_dontaudit_raw_recvfrom_unlabeled',` +@@ -2533,15 +3280,10 @@ interface(`corenet_dontaudit_raw_recvfrom_unlabeled',` ## # interface(`corenet_all_recvfrom_unlabeled',` @@ -5436,7 +5420,7 @@ index 07126bd..38ba47d 100644 ') ######################################## -@@ -2567,11 +3291,34 @@ interface(`corenet_all_recvfrom_unlabeled',` +@@ -2567,11 +3309,34 @@ interface(`corenet_all_recvfrom_unlabeled',` # interface(`corenet_all_recvfrom_netlabel',` gen_require(` @@ -5474,7 +5458,7 @@ index 07126bd..38ba47d 100644 ') ######################################## -@@ -2585,6 +3332,7 @@ interface(`corenet_all_recvfrom_netlabel',` +@@ -2585,6 +3350,7 @@ interface(`corenet_all_recvfrom_netlabel',` ## # interface(`corenet_dontaudit_all_recvfrom_unlabeled',` @@ -5482,7 +5466,7 @@ index 07126bd..38ba47d 100644 kernel_dontaudit_tcp_recvfrom_unlabeled($1) kernel_dontaudit_udp_recvfrom_unlabeled($1) kernel_dontaudit_raw_recvfrom_unlabeled($1) -@@ -2613,7 +3361,35 @@ interface(`corenet_dontaudit_all_recvfrom_netlabel',` +@@ -2613,7 +3379,35 @@ interface(`corenet_dontaudit_all_recvfrom_netlabel',` ') dontaudit $1 netlabel_peer_t:peer recv; @@ -5519,7 +5503,7 @@ index 07126bd..38ba47d 100644 ') ######################################## -@@ -2727,6 +3503,7 @@ interface(`corenet_raw_recvfrom_labeled',` +@@ -2727,6 +3521,7 @@ interface(`corenet_raw_recvfrom_labeled',` ## # interface(`corenet_all_recvfrom_labeled',` @@ -5527,13 +5511,30 @@ index 07126bd..38ba47d 100644 corenet_tcp_recvfrom_labeled($1, $2) corenet_udp_recvfrom_labeled($1, $2) corenet_raw_recvfrom_labeled($1, $2) -@@ -3134,3 +3911,53 @@ interface(`corenet_unconfined',` +@@ -3134,3 +3929,70 @@ interface(`corenet_unconfined',` typeattribute $1 corenet_unconfined_type; ') + +######################################## +## ++## Dontaudit bind tcp sockets to defined ports. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`corenet_dontaudit_tcp_bind_all_defined_ports',` ++ gen_require(` ++ attribute defined_port_type; ++ ') ++ dontaudit $1 defined_port_type:tcp_socket name_bind; ++') ++ ++######################################## ++## +## Create all network named devices with the correct label +## +## diff --git a/policy-f20-contrib.patch b/policy-f20-contrib.patch index b4dc9b1..ee269bc 100644 --- a/policy-f20-contrib.patch +++ b/policy-f20-contrib.patch @@ -45547,7 +45547,7 @@ index 6194b80..7490fe3 100644 ') + diff --git a/mozilla.te b/mozilla.te -index 6a306ee..86bcc0e 100644 +index 6a306ee..6c2d2fa 100644 --- a/mozilla.te +++ b/mozilla.te @@ -1,4 +1,4 @@ @@ -46609,8 +46609,8 @@ index 6a306ee..86bcc0e 100644 -optional_policy(` - xserver_use_user_fonts(mozilla_plugin_config_t) +tunable_policy(`mozilla_plugin_use_bluejeans',` -+ corenet_tcp_bind_all_unreserved_ports(mozilla_plugin_t) -+ corenet_dontaudit_tcp_bind_all_reserved_ports(mozilla_plugin_t) ++ corenet_tcp_bind_unreserved_ports(mozilla_plugin_t) ++ corenet_dontaudit_tcp_bind_all_defined_ports(mozilla_plugin_t) ') diff --git a/mpd.fc b/mpd.fc index 313ce52..ae93e07 100644 diff --git a/selinux-policy.spec b/selinux-policy.spec index 298fa91..868d1ee 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -19,7 +19,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.12.1 -Release: 170%{?dist} +Release: 171%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -579,6 +579,9 @@ SELinux Reference policy mls base module. %endif %changelog +* Wed Jun 18 2014 Lukas Vrabec 3.12.1-171 +- Add additional interfaces needed by mozilla_plugin_use_bluejeans boolean + * Wed Jun 18 2014 Lukas Vrabec 3.12.1-170 - Add labels for swapon and xfs_growfs - Add mozilla_plugin_use_bluejeans boolean