Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967488Ab2EPN16 (ORCPT ); Wed, 16 May 2012 09:27:58 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:38863 "EHLO e9.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758881Ab2EPN1y (ORCPT ); Wed, 16 May 2012 09:27:54 -0400 Message-ID: <1337174825.3522.1.camel@falcor> Subject: Re: [PATCH] vfs: fix IMA lockdep circular locking dependency From: Mimi Zohar To: James Morris Cc: Linus Torvalds , Al Viro , Eric Paris , Mimi Zohar , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 16 May 2012 09:27:05 -0400 In-Reply-To: References: <1336963631-3541-1-git-send-email-zohar@us.ibm.com> <1337112446.20904.50.camel@falcor> <20120516004251.GO22082@ZenIV.linux.org.uk> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3 (3.2.3-3.fc16) Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12051613-7182-0000-0000-00000186A555 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1142 Lines: 34 On Wed, 2012-05-16 at 21:38 +1000, James Morris wrote: > On Wed, 16 May 2012, James Morris wrote: > > > On Tue, 15 May 2012, Linus Torvalds wrote: > > > > > Hmm? > > > > diff --git a/security/capability.c b/security/capability.c > > index 5bb21b1c448c..9a19c6a54e12 100644 > > --- a/security/capability.c > > +++ b/security/capability.c > > @@ -949,7 +949,6 @@ void __init security_fixup_ops(struct > > security_operations *ops) > > set_to_cap_if_null(ops, file_alloc_security); > > set_to_cap_if_null(ops, file_free_security); > > set_to_cap_if_null(ops, file_ioctl); > > - set_to_cap_if_null(ops, file_mmap); > > set_to_cap_if_null(ops, file_mprotect); > > set_to_cap_if_null(ops, file_lock); > > set_to_cap_if_null(ops, file_fcntl); > > > > > > Do we need to add addr_map to the fixup ops? > > mmap_addr I mean. I would think so. -- 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/