Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751563AbdINUWO (ORCPT ); Thu, 14 Sep 2017 16:22:14 -0400 Received: from namei.org ([65.99.196.166]:35038 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751330AbdINUWM (ORCPT ); Thu, 14 Sep 2017 16:22:12 -0400 Date: Fri, 15 Sep 2017 06:21:28 +1000 (AEST) From: James Morris To: Mimi Zohar cc: linux-security-module@vger.kernel.org, Christoph Hellwig , linux-ima-devel@lists.sourceforge.net, Christoph Hellwig , Linus Torvalds , Linux Kernel Mailing List Subject: Re: [PATCH 2/2] integrity: replace call to integrity_read_file with kernel version In-Reply-To: <1505270734-4280-2-git-send-email-zohar@linux.vnet.ibm.com> Message-ID: References: <1505270734-4280-1-git-send-email-zohar@linux.vnet.ibm.com> <1505270734-4280-2-git-send-email-zohar@linux.vnet.ibm.com> User-Agent: Alpine 2.21 (LRH 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 866 Lines: 26 On Tue, 12 Sep 2017, Mimi Zohar wrote: > From: Christoph Hellwig > > The CONFIG_IMA_LOAD_X509 and CONFIG_EVM_LOAD_X509 options permit > loading x509 signed certificates onto the trusted keyrings without > verifying the x509 certificate file's signature. > > This patch replaces the call to the integrity_read_file() specific > function with the common kernel_read_file_from_path() function. > To avoid verifying the file signature, this patch defines > READING_X509_CERTFICATE. So, to be clear, this patch solves the XFS deadlock using a different approach (to the now reverted integrity_read approach), which Christoph also says is more correct generally. Correct? What testing has this had? Should this go in with the rest of the security changes now or wait until either -rc or the next merge window? -- James Morris