Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751568AbdINXWe (ORCPT ); Thu, 14 Sep 2017 19:22:34 -0400 Received: from namei.org ([65.99.196.166]:35069 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751380AbdINXWc (ORCPT ); Thu, 14 Sep 2017 19:22:32 -0400 Date: Fri, 15 Sep 2017 09:21:53 +1000 (AEST) From: James Morris To: Christoph Hellwig cc: Mimi Zohar , linux-security-module@vger.kernel.org, Christoph Hellwig , linux-ima-devel@lists.sourceforge.net, Linus Torvalds , Linux Kernel Mailing List Subject: Re: [PATCH 2/2] integrity: replace call to integrity_read_file with kernel version In-Reply-To: <20170914204954.GA27029@infradead.org> 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> <20170914204954.GA27029@infradead.org> 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: 911 Lines: 23 On Thu, 14 Sep 2017, Christoph Hellwig wrote: > On Fri, Sep 15, 2017 at 06:21:28AM +1000, James Morris wrote: > > 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? > > No. It is in addition to the previous patches - the patches were > correct for the IMA interaction with the I/O path. It just turns > out that the function was also reused for reading certificates > at initialization time, for which that change was incorrect. > > If this series is applied first the integrity_read code is not > used for that path any more. Ok. Sorry I hadn't looked at the code in detail at this stage during the conference and wanting to just revert back to something that Linus can safely pull before the merge window closes. -- James Morris