From 07866ad826b299194c1bfd7978e5077dde72a68e Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Mon, 11 Oct 2021 10:10:10 +0800
Subject: [PATCH] policy/modules/admin/usermanage: allow useradd to relabel
 user home files

Fixes:
avc: denied { relabelfrom } for pid=491 comm="useradd" name=".bashrc"
dev="vda" ino=12641 scontext=root:sysadm_r:useradd_t
tcontext=user_u:object_r:user_home_t tclass=file permissive=0

Upstream-Status: Inappropriate [embedded specific]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 policy/modules/admin/usermanage.te  |  2 ++
 policy/modules/system/userdomain.if | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/policy/modules/admin/usermanage.te b/policy/modules/admin/usermanage.te
index 98646b4b4..50c479498 100644
--- a/policy/modules/admin/usermanage.te
+++ b/policy/modules/admin/usermanage.te
@@ -496,6 +496,7 @@ files_read_etc_runtime_files(useradd_t)
 
 fs_search_auto_mountpoints(useradd_t)
 fs_getattr_xattr_fs(useradd_t)
+fs_search_tmpfs(useradd_t)
 
 mls_file_upgrade(useradd_t)
 
@@ -541,6 +542,7 @@ userdom_home_filetrans_user_home_dir(useradd_t)
 userdom_manage_user_home_content_dirs(useradd_t)
 userdom_manage_user_home_content_files(useradd_t)
 userdom_user_home_dir_filetrans_user_home_content(useradd_t, notdevfile_class_set)
+userdom_relabel_user_home_content_files(useradd_t)
 
 optional_policy(`
 	mta_manage_spool(useradd_t)
diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
index 22b3c1bf7..ec625170d 100644
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -2362,6 +2362,24 @@ interface(`userdom_dontaudit_relabel_user_home_content_files',`
 	dontaudit $1 user_home_t:file relabel_file_perms;
 ')
 
+########################################
+## <summary>
+##	Relabel user home files.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`userdom_relabel_user_home_content_files',`
+	gen_require(`
+		type user_home_t;
+	')
+
+	allow $1 user_home_t:file relabel_file_perms;
+')
+
 ########################################
 ## <summary>
 ##	Read user home subdirectory symbolic links.
-- 
2.17.1