From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 411741395E2 for ; Tue, 6 Dec 2016 13:39:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2E3F21C2FB; Tue, 6 Dec 2016 13:39:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C098921C2FB for ; Tue, 6 Dec 2016 13:39:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D2FF6341024 for ; Tue, 6 Dec 2016 13:39:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E47F24BF for ; Tue, 6 Dec 2016 13:39:35 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1481027973.d92c0e639cb7f7842e76a2c054ab5ddcac61e38c.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/services/xserver.fc policy/modules/services/xserver.if policy/modules/services/xserver.te X-VCS-Directories: policy/modules/services/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: d92c0e639cb7f7842e76a2c054ab5ddcac61e38c X-VCS-Branch: master Date: Tue, 6 Dec 2016 13:39:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 359f819b-925c-45bb-8215-e5e55e7b9f98 X-Archives-Hash: 6b76ccf6e48bd0df172e7ef26cd8b2ba commit: d92c0e639cb7f7842e76a2c054ab5ddcac61e38c Author: Guido Trentalancia trentalancia net> AuthorDate: Fri Dec 2 13:44:07 2016 +0000 Commit: Jason Zaman gentoo org> CommitDate: Tue Dec 6 12:39:33 2016 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=d92c0e63 xserver: remove unneeded user content permissions Remove unneeded permissions to read user content from the xserver module (xserver and xdm domains). Signed-off-by: Guido Trentalancia trentalancia.net> policy/modules/services/xserver.fc | 1 + policy/modules/services/xserver.if | 19 +++++++++++++++++++ policy/modules/services/xserver.te | 9 +++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/policy/modules/services/xserver.fc b/policy/modules/services/xserver.fc index 4cbba44..41b97e2 100644 --- a/policy/modules/services/xserver.fc +++ b/policy/modules/services/xserver.fc @@ -1,6 +1,7 @@ # # HOME_DIR # +HOME_DIR/\.dmrc -- gen_context(system_u:object_r:dmrc_home_t,s0) HOME_DIR/\.fonts\.conf -- gen_context(system_u:object_r:user_fonts_config_t,s0) HOME_DIR/\.fonts(/.*)? gen_context(system_u:object_r:user_fonts_t,s0) HOME_DIR/\.fonts/auto(/.*)? gen_context(system_u:object_r:user_fonts_cache_t,s0) diff --git a/policy/modules/services/xserver.if b/policy/modules/services/xserver.if index afc157f..a5dbdaa 100644 --- a/policy/modules/services/xserver.if +++ b/policy/modules/services/xserver.if @@ -602,6 +602,25 @@ interface(`xserver_read_user_xauth',` ######################################## ## +## Read all users .dmrc. +## +## +## +## Domain allowed access. +## +## +# +interface(`xserver_read_user_dmrc',` + gen_require(` + type dmrc_home_t; + ') + + allow $1 dmrc_home_t:file read_file_perms; + userdom_search_user_home_dirs($1) +') + +######################################## +## ## Set the attributes of the X windows console named pipes. ## ## diff --git a/policy/modules/services/xserver.te b/policy/modules/services/xserver.te index 097fd07..96cc1ff 100644 --- a/policy/modules/services/xserver.te +++ b/policy/modules/services/xserver.te @@ -211,6 +211,9 @@ corecmd_executable_file(xsession_exec_t) type xserver_log_t; logging_log_file(xserver_log_t) +type dmrc_home_t; +userdom_user_home_content(dmrc_home_t) + ifdef(`enable_mcs',` init_ranged_domain(xdm_t, xdm_exec_t, s0 - mcs_systemhigh) init_ranged_daemon_domain(xdm_t, xdm_exec_t, s0 - mcs_systemhigh) @@ -467,12 +470,14 @@ sysnet_read_config(xdm_t) userdom_dontaudit_use_unpriv_user_fds(xdm_t) userdom_create_all_users_keys(xdm_t) -# for .dmrc -userdom_read_user_home_content_files(xdm_t) # Search /proc for any user domain processes. userdom_read_all_users_state(xdm_t) userdom_signal_all_users(xdm_t) +# for .dmrc: this was used by the Gnome Display Manager (gdm) +# and it is now obsolete in Gnome3 +xserver_read_user_dmrc(xdm_t) + xserver_rw_session(xdm_t, xdm_tmpfs_t) xserver_unconfined(xdm_t)