Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759013AbYAXUp6 (ORCPT ); Thu, 24 Jan 2008 15:45:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758359AbYAXUjj (ORCPT ); Thu, 24 Jan 2008 15:39:39 -0500 Received: from mummy.ncsc.mil ([144.51.88.129]:60671 "EHLO mummy.ncsc.mil" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758892AbYAXUji (ORCPT ); Thu, 24 Jan 2008 15:39:38 -0500 X-Greylist: delayed 519 seconds by postgrey-1.27 at vger.kernel.org; Thu, 24 Jan 2008 15:39:38 EST Message-ID: <4798F57C.8090300@tycho.nsa.gov> Date: Thu, 24 Jan 2008 15:30:52 -0500 From: Eamon Walsh User-Agent: Thunderbird 2.0.0.9 (X11/20071115) MIME-Version: 1.0 To: SELinux List CC: linux-kernel@vger.kernel.org, James Morris , Stephen Smalley Subject: [PATCH] selinux: make mls_compute_sid always polyinstantiate Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1692 Lines: 49 This patch removes the requirement that the new and related object types differ in order to polyinstantiate by MLS level. This allows MLS polyinstantiation to occur in the absence of explicit type_member rules or when the type has not changed. Potential users of this support include pam_namespace.so (directory polyinstantiation) and the SELinux X support (property polyinstantiation). Signed-off-by: Eamon Walsh --- mls.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c index fb5d70a..3bbcb53 100644 --- a/security/selinux/ss/mls.c +++ b/security/selinux/ss/mls.c @@ -537,15 +537,8 @@ int mls_compute_sid(struct context *scontext, /* Use the process effective MLS attributes. */ return mls_context_cpy_low(newcontext, scontext); case AVTAB_MEMBER: - /* Only polyinstantiate the MLS attributes if - the type is being polyinstantiated */ - if (newcontext->type != tcontext->type) { - /* Use the process effective MLS attributes. */ - return mls_context_cpy_low(newcontext, scontext); - } else { - /* Use the related object MLS attributes. */ - return mls_context_cpy(newcontext, tcontext); - } + /* Use the process effective MLS attributes. */ + return mls_context_cpy_low(newcontext, scontext); default: return -EINVAL; } -- Eamon Walsh National Security Agency -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/