Skip to contentSkip to conversation

refpolicy-targeted: rebase patches for 2.20170204

PATCH New [email protected] 1 participant 3 messages Oct 9, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 refpolicy-targeted: rebase patches for 2.20170204

From: Wenzong Fan <[email protected]>

Rebase and apply the patches for 2.20170204:
- refpolicy-fix-optional-issue-on-sysadm-module.patch
- refpolicy-unconfined_u-default-user.patch

---
 ...olicy-fix-optional-issue-on-sysadm-module.patch |  33 +++--
 .../refpolicy-unconfined_u-default-user.patch      | 140 +++++++++------------
 2 files changed, 77 insertions(+), 96 deletions(-)
recipes-security/refpolicy/refpolicy-targeted/refpolicy-fix-optional-issue-on-sysadm-module.patch +15 -18
index b33e84b..04fc575 100644
@@ -17,12 +17,12 @@ Signed-off-by: Joe MacDonald <[email protected]>
  policy/modules/system/locallogin.te |  4 +++-
  2 files changed, 11 insertions(+), 7 deletions(-)
 
+diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te
+index 6503fff..be291a9 100644
 --- a/policy/modules/system/init.te
 +++ b/policy/modules/system/init.te
-@@ -344,17 +344,19 @@ ifdef(`init_systemd',`
- 
- 	optional_policy(`
- 		modutils_domtrans(init_t)
+@@ -302,12 +302,14 @@ ifdef(`init_systemd',`
+ 		modutils_domtrans_insmod(init_t)
  	')
  ',`
 -	tunable_policy(`init_upstart',`
@@ -30,27 +30,23 @@ Signed-off-by: Joe MacDonald <[email protected]>
 -	',`
 -		# Run the shell in the sysadm role for single-user mode.
 -		# causes problems with upstart
--		ifndef(`distro_debian',`
--			sysadm_shell_domtrans(init_t)
+-		sysadm_shell_domtrans(init_t)
 +	optional_policy(`
 +		tunable_policy(`init_upstart',`
 +			corecmd_shell_domtrans(init_t, initrc_t)
 +		',`
 +			# Run the shell in the sysadm role for single-user mode.
 +			# causes problems with upstart
-+			ifndef(`distro_debian',`
-+				sysadm_shell_domtrans(init_t)
-+			')
- 		')
++			sysadm_shell_domtrans(init_t)
++		')
  	')
  ')
  
- ifdef(`distro_debian',`
+diff --git a/policy/modules/system/locallogin.te b/policy/modules/system/locallogin.te
+index 8386084..5242713 100644
 --- a/policy/modules/system/locallogin.te
 +++ b/policy/modules/system/locallogin.te
-@@ -260,11 +260,13 @@ seutil_read_default_contexts(sulogin_t)
- userdom_use_unpriv_users_fds(sulogin_t)
- 
+@@ -246,7 +246,9 @@ userdom_use_unpriv_users_fds(sulogin_t)
  userdom_search_user_home_dirs(sulogin_t)
  userdom_use_user_ptys(sulogin_t)
  
@@ -59,7 +55,8 @@ Signed-off-by: Joe MacDonald <[email protected]>
 +	sysadm_shell_domtrans(sulogin_t)
 +')
  
- # by default, sulogin does not use pam...
- # sulogin_pam might need to be defined otherwise
- ifdef(`sulogin_pam', `
- 	selinux_get_fs_mount(sulogin_t)
+ # suse and debian do not use pam with sulogin...
+ ifdef(`distro_suse', `define(`sulogin_no_pam')')
+-- 
+2.13.0
+
recipes-security/refpolicy/refpolicy-targeted/refpolicy-unconfined_u-default-user.patch +62 -78

214 lines not on this page · raw message

Signature · 1 line
2.13.0
#1 lore raw

PATCH 2/3 refpolicy: fix unknown classes and permissions

From: Wenzong Fan <[email protected]>

Backport upstream patches:
- 0001-refpolicy-Define-getrlimit-permission-for-class-proc.patch
- 0002-refpolicy-Define-smc_socket-security-class.patch

This fixes the runtime issues:

  $ load_policy
  SELinux: Permission getrlimit in class process not defined in policy.
  SELinux: Class smc_socket not defined in policy.
  SELinux: the above unknown classes and permissions will be allowed
---
 ...efine-getrlimit-permission-for-class-proc.patch | 33 ++++++++++
 ...efpolicy-Define-smc_socket-security-class.patch | 74 ++++++++++++++++++++++
 .../refpolicy/refpolicy_2.20170204.inc             |  6 ++
 3 files changed, 113 insertions(+)
 create mode 100644 recipes-security/refpolicy/refpolicy-2.20170204/0001-refpolicy-Define-getrlimit-permission-for-class-proc.patch
 create mode 100644 recipes-security/refpolicy/refpolicy-2.20170204/0002-refpolicy-Define-smc_socket-security-class.patch
recipes-security/refpolicy/refpolicy-2.20170204/0001-refpolicy-Define-getrlimit-permission-for-class-proc.patch new file +33 -0
new file mode 100644
index 0000000..727e48a
@@ -0,0 +1,33 @@
+From c5cdfec50b4d6191173725b32b311399345962ac Mon Sep 17 00:00:00 2001
+From: Stephen Smalley <[email protected]>
+Date: Wed, 17 May 2017 11:33:46 -0400
+Subject: [PATCH 1/2] refpolicy: Define getrlimit permission for class process
+
+This permission was added to the kernel in commit 791ec491c372
+("prlimit,security,selinux: add a security hook for prlimit")
+circa Linux 4.12 in order to control the ability to get the resource
+limits of another process.  It is only checked when acting on another
+process, so getrlimit permission is not required for use of getrlimit(2).
+
+Signed-off-by: Stephen Smalley <[email protected]>
+
+Upstream-Status: Backport
+---
+ policy/flask/access_vectors | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/policy/flask/access_vectors b/policy/flask/access_vectors
+index 69f69af..6204e68 100644
+--- a/policy/flask/access_vectors
++++ b/policy/flask/access_vectors
+@@ -383,6 +383,7 @@ class process
+ 	execheap
+ 	setkeycreate
+ 	setsockcreate
++	getrlimit
+ }
+ 
+ 
+-- 
+2.7.4
+
recipes-security/refpolicy/refpolicy-2.20170204/0002-refpolicy-Define-smc_socket-security-class.patch new file +74 -0

74 lines not on this page · raw message

recipes-security/refpolicy/refpolicy_2.20170204.inc +6 -0
index 8b72cbd..51c5050 100644
@@ -55,4 +55,10 @@ SRC_URI += " \
             file://ftp-add-ftpd_t-to-mlsfilewrite.patch \
            "
 
+# Backport from upstream
+SRC_URI += " \
+            file://0001-refpolicy-Define-getrlimit-permission-for-class-proc.patch \
+            file://0002-refpolicy-Define-smc_socket-security-class.patch \
+           "
+
 include refpolicy_common.inc
Signature · 1 line
2.13.0
#2 lore raw

PATCH 3/3 refpolicy-minimum: fix build error with systemd

In reply to [email protected]

From: Wenzong Fan <[email protected]>

Update patch to fix build error with systemd:

* replace below statements with 'init_dbus_chat(initrc_t)':
allow initrc_t init_t:dbus send_msg;
allow init_t initrc_t:dbus send_msg;

* declare class 'dbus' and 'acquire_svc' for:
allow init_t initrc_t:dbus { acquire_svc };

This fixes build errors:

| policy/modules/system/init.te:1120:ERROR 'class dbus is not within scope' at token ';' on line 40246:
| allow initrc_t init_t:dbus send_msg;
| allow init_t initrc_t:dbus { send_msg acquire_svc };
---
 ...07-refpolicy-minimum-systemd-fix-for-login-journal-serv.patch | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
recipes-security/refpolicy/refpolicy-minimum/0007-refpolicy-minimum-systemd-fix-for-login-journal-serv.patch +6 -3
index 50e3c64..a4084d7 100644
@@ -49,15 +49,18 @@ diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te
 index 19a7a20..cefa59d 100644
 --- a/policy/modules/system/init.te
 +++ b/policy/modules/system/init.te
-@@ -1105,3 +1105,8 @@ allow init_t self:capability2 audit_read;
+@@ -1105,3 +1105,11 @@ allow init_t self:capability2 audit_read;
  
  allow initrc_t init_t:system { start status reboot };
  allow initrc_t init_var_run_t:service { start status };
 +
 +allow initrc_t init_var_run_t:service stop;
-+allow initrc_t init_t:dbus send_msg;
++init_dbus_chat(initrc_t)
 +
-+allow init_t initrc_t:dbus { send_msg acquire_svc };
++gen_require(`
++	class dbus acquire_svc;
++')
++allow init_t initrc_t:dbus { acquire_svc };
 diff --git a/policy/modules/system/locallogin.te b/policy/modules/system/locallogin.te
 index 09ec33f..be25c82 100644
 --- a/policy/modules/system/locallogin.te
Signature · 1 line
2.13.0