[refpolicy] [PATCH] No longer use deprecated MLS interfaces

[cpebenito@tresys.com (Christopher J. PeBenito)]

On 05/23/2014 02:18 PM, Nicolas Iooss wrote:
> Since commit 2d0c9cec mls_file_read_up and mls_file_write_down
> interfaces are deprecated even though they are still present.
> 
> Replace mls_file_read_up with mls_file_read_all_levels and
> mls_file_write_down with mls_file_write_all_levels.

I thought I had fixed the deprecated interface usage a long time ago.  Thanks for catching these.

Merged.


> ---
>  policy/modules/kernel/kernel.te     | 4 ++--
>  policy/modules/roles/secadm.te      | 2 +-
>  policy/modules/roles/sysadm.te      | 2 +-
>  policy/modules/system/init.te       | 6 +++---
>  policy/modules/system/setrans.te    | 2 +-
>  policy/modules/system/udev.te       | 2 +-
>  policy/modules/system/userdomain.if | 2 +-
>  7 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/policy/modules/kernel/kernel.te b/policy/modules/kernel/kernel.te
> index f436490..b72d30d 100644
> --- a/policy/modules/kernel/kernel.te
> +++ b/policy/modules/kernel/kernel.te
> @@ -289,8 +289,8 @@ files_read_usr_files(kernel_t)
>  
>  mcs_process_set_categories(kernel_t)
>  
> -mls_process_read_up(kernel_t)
> -mls_process_write_down(kernel_t)
> +mls_process_read_all_levels(kernel_t)
> +mls_process_write_all_levels(kernel_t)
>  mls_file_write_all_levels(kernel_t)
>  mls_file_read_all_levels(kernel_t)
>  
> diff --git a/policy/modules/roles/secadm.te b/policy/modules/roles/secadm.te
> index da11120..2da0b26 100644
> --- a/policy/modules/roles/secadm.te
> +++ b/policy/modules/roles/secadm.te
> @@ -23,7 +23,7 @@ dev_relabel_all_dev_nodes(secadm_t)
>  
>  domain_obj_id_change_exemption(secadm_t)
>  
> -mls_process_read_up(secadm_t)
> +mls_process_read_all_levels(secadm_t)
>  mls_file_read_all_levels(secadm_t)
>  mls_file_write_all_levels(secadm_t)
>  mls_file_upgrade(secadm_t)
> diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te
> index 7e3d23e..6e00d2b 100644
> --- a/policy/modules/roles/sysadm.te
> +++ b/policy/modules/roles/sysadm.te
> @@ -27,7 +27,7 @@ ifndef(`enable_mls',`
>  
>  corecmd_exec_shell(sysadm_t)
>  
> -mls_process_read_up(sysadm_t)
> +mls_process_read_all_levels(sysadm_t)
>  
>  ubac_process_exempt(sysadm_t)
>  ubac_file_exempt(sysadm_t)
> diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te
> index b2b0a76..75f57d1 100644
> --- a/policy/modules/system/init.te
> +++ b/policy/modules/system/init.te
> @@ -154,7 +154,7 @@ mcs_killall(init_t)
>  
>  mls_file_read_all_levels(init_t)
>  mls_file_write_all_levels(init_t)
> -mls_process_write_down(init_t)
> +mls_process_write_all_levels(init_t)
>  mls_fd_use_all_levels(init_t)
>  
>  selinux_set_all_booleans(init_t)
> @@ -385,8 +385,8 @@ mcs_process_set_categories(initrc_t)
>  
>  mls_file_read_all_levels(initrc_t)
>  mls_file_write_all_levels(initrc_t)
> -mls_process_read_up(initrc_t)
> -mls_process_write_down(initrc_t)
> +mls_process_read_all_levels(initrc_t)
> +mls_process_write_all_levels(initrc_t)
>  mls_rangetrans_source(initrc_t)
>  mls_fd_share_all_levels(initrc_t)
>  
> diff --git a/policy/modules/system/setrans.te b/policy/modules/system/setrans.te
> index d98b5b2..5dba88e 100644
> --- a/policy/modules/system/setrans.te
> +++ b/policy/modules/system/setrans.te
> @@ -68,7 +68,7 @@ mls_file_read_all_levels(setrans_t)
>  mls_file_write_all_levels(setrans_t)
>  mls_net_receive_all_levels(setrans_t)
>  mls_socket_write_all_levels(setrans_t)
> -mls_process_read_up(setrans_t)
> +mls_process_read_all_levels(setrans_t)
>  mls_socket_read_all_levels(setrans_t)
>  
>  selinux_compute_access_vector(setrans_t)
> diff --git a/policy/modules/system/udev.te b/policy/modules/system/udev.te
> index b0aa655..0f486d4 100644
> --- a/policy/modules/system/udev.te
> +++ b/policy/modules/system/udev.te
> @@ -130,7 +130,7 @@ mls_file_read_all_levels(udev_t)
>  mls_file_write_all_levels(udev_t)
>  mls_file_upgrade(udev_t)
>  mls_file_downgrade(udev_t)
> -mls_process_write_down(udev_t)
> +mls_process_write_all_levels(udev_t)
>  
>  selinux_get_fs_mount(udev_t)
>  selinux_validate_context(udev_t)
> diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
> index 39e665d..f7c74c3 100644
> --- a/policy/modules/system/userdomain.if
> +++ b/policy/modules/system/userdomain.if
> @@ -1256,7 +1256,7 @@ template(`userdom_security_admin_template',`
>  	# Necessary for managing /boot/efi
>  	fs_manage_dos_files($1)
>  
> -	mls_process_read_up($1)
> +	mls_process_read_all_levels($1)
>  	mls_file_read_all_levels($1)
>  	mls_file_upgrade($1)
>  	mls_file_downgrade($1)
> 


-- 
Chris PeBenito
Tresys Technology, LLC
www.tresys.com | oss.tresys.com