From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752901AbcALQDK (ORCPT <rfc822;w@1wt.eu>);
	Tue, 12 Jan 2016 11:03:10 -0500
Received: from e23smtp07.au.ibm.com ([202.81.31.140]:52358 "EHLO
	e23smtp07.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751683AbcALQDG (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 12 Jan 2016 11:03:06 -0500
X-IBM-Helo: d23dlp03.au.ibm.com
X-IBM-MailFrom: zohar@linux.vnet.ibm.com
X-IBM-RcptTo: keyrings@vger.kernel.org;linux-kernel@vger.kernel.org;linux-security-module@vger.kernel.org
Message-ID: <1452614526.4776.200.camel@linux.vnet.ibm.com>
Subject: Re: [PATCH] X.509: Partially revert patch to add validation against
 IMA MOK keyring
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: David Howells <dhowells@redhat.com>
Cc: "Mark D. Baushke" <mdb@juniper.net>, James Morris <jmorris@namei.org>,
        Marcel Holtmann <marcel@holtmann.org>, petkan@mip-labs.com,
        linux-security-module@vger.kernel.org, keyrings@vger.kernel.org,
        linux-kernel@vger.kernel.org
Date: Tue, 12 Jan 2016 11:02:06 -0500
In-Reply-To: <16522.1452614218@warthog.procyon.org.uk>
References: <1452611828.4776.181.camel@linux.vnet.ibm.com>
	 <1452604893.4776.134.camel@linux.vnet.ibm.com>
	 <1452569755.4776.69.camel@linux.vnet.ibm.com>
	 <88773.1452562139@eng-mail01.juniper.net>
	 <1452470153.2651.60.camel@linux.vnet.ibm.com>
	 <2033.1452447990@warthog.procyon.org.uk>
	 <1452432410.2651.40.camel@linux.vnet.ibm.com>
	 <20160106134525.15633.73582.stgit@warthog.procyon.org.uk>
	 <24185.1452126854@warthog.procyon.org.uk>
	 <1452180676.2890.21.camel@linux.vnet.ibm.com>
	 <alpine.LRH.2.20.1601102135470.6161@namei.org>
	 <3384.1452458018@warthog.procyon.org.uk>
	 <27007.1452559481@warthog.procyon.org.uk>
	 <31702.1452564218@warthog.procyon.org.uk>
	 <31422.1452593319@warthog.procyon.org.uk>
	 <14160.1452606924@warthog.procyon.org.uk>
	 <16522.1452614218@warthog.procyon.org.uk>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.12.11 (3.12.11-1.fc21) 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
X-TM-AS-MML: disable
X-Content-Scanned: Fidelis XPS MAILER
x-cbid: 16011216-0025-0000-0000-000002BC809B
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, 2016-01-12 at 15:56 +0000, David Howells wrote:
> Mimi Zohar <zohar@linux.vnet.ibm.com> wrote:
> 
> > > > The name "restrict_link_by_ima_mok()" doesn't reflect that it is either
> > > > the system keyring or the IMA MOK keyring.
> > > 
> > > How about restrict_link_by_ima_trusted()?
> > 
> > Good.  restrict_link_by_ima_trusted would only check the IMA MOK keyring
> > if it was configured.
> 
> And the system keyring?

Only keys signed by the system keyring can be added to the .ima keyring,
unless IMA MOK is enabled.  In that case, keys signed by either the
system or IMA MOK keyring can be added to the .ima keyring.

Mimi