From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E24D858973 for ; Sat, 30 Jan 2016 17:21:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C81321C01F; Sat, 30 Jan 2016 17:21:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EFD3221C01E for ; Sat, 30 Jan 2016 17:21:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 329A3340943 for ; Sat, 30 Jan 2016 17:21:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8AFA8F6 for ; Sat, 30 Jan 2016 17:21:17 +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: <1454174216.17d97f0a9bb787b5feb0fa8aaf23a87bfdc79d00.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/, policy/modules/kernel/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/kernel/corecommands.fc policy/modules/services/ssh.fc X-VCS-Directories: policy/modules/kernel/ policy/modules/services/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 17d97f0a9bb787b5feb0fa8aaf23a87bfdc79d00 X-VCS-Branch: master Date: Sat, 30 Jan 2016 17:21:17 +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: 16337864-358d-4c30-a61d-30143c16d1f7 X-Archives-Hash: 654e9daf345b4c523c7621c95b9cdfc1 commit: 17d97f0a9bb787b5feb0fa8aaf23a87bfdc79d00 Author: Nicolas Iooss m4x org> AuthorDate: Sun Dec 20 15:28:49 2015 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sat Jan 30 17:16:56 2016 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=17d97f0a Label OpenSSH files correctly on Arch Linux On Arch Linux, OpenSSH installs these binary files in /usr/lib/ssh: * sftp-server (labeled with ssh_keysign_exec_t type in refpolicy) * ssh-askpass (symlink to x11-ssh-askpass) * ssh-keysign * ssh-pkcs11-helper * x11-ssh-askpass (from x11-ssh-askpass package) Label all these files but sftp-server as bin_t. policy/modules/kernel/corecommands.fc | 1 + policy/modules/services/ssh.fc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc index 8f12446..beb3ad8 100644 --- a/policy/modules/kernel/corecommands.fc +++ b/policy/modules/kernel/corecommands.fc @@ -240,6 +240,7 @@ ifdef(`distro_gentoo',` /usr/lib/rpm/rpmq -- gen_context(system_u:object_r:bin_t,s0) /usr/lib/rpm/rpmv -- gen_context(system_u:object_r:bin_t,s0) /usr/lib/sftp-server -- gen_context(system_u:object_r:bin_t,s0) +/usr/lib/ssh(/.*)? gen_context(system_u:object_r:bin_t,s0) /usr/lib/sudo/sesh -- gen_context(system_u:object_r:shell_exec_t,s0) /usr/lib/systemd/systemd.* -- gen_context(system_u:object_r:bin_t,s0) /usr/lib/systemd/system-generators(/.*)? gen_context(system_u:object_r:bin_t,s0) diff --git a/policy/modules/services/ssh.fc b/policy/modules/services/ssh.fc index 8168244..fd6c218 100644 --- a/policy/modules/services/ssh.fc +++ b/policy/modules/services/ssh.fc @@ -7,7 +7,8 @@ HOME_DIR/\.ssh(/.*)? gen_context(system_u:object_r:ssh_home_t,s0) /usr/bin/ssh-agent -- gen_context(system_u:object_r:ssh_agent_exec_t,s0) /usr/bin/ssh-keygen -- gen_context(system_u:object_r:ssh_keygen_exec_t,s0) -/usr/lib/openssh/ssh-keysign -- gen_context(system_u:object_r:ssh_keysign_exec_t,s0) +/usr/lib/openssh/ssh-keysign -- gen_context(system_u:object_r:ssh_keysign_exec_t,s0) +/usr/lib/ssh/ssh-keysign -- gen_context(system_u:object_r:ssh_keysign_exec_t,s0) /usr/libexec/openssh/ssh-keysign -- gen_context(system_u:object_r:ssh_keysign_exec_t,s0)