Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030285Ab2EPLiO (ORCPT ); Wed, 16 May 2012 07:38:14 -0400 Received: from tundra.namei.org ([65.99.196.166]:35122 "EHLO tundra.namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967442Ab2EPLiM (ORCPT ); Wed, 16 May 2012 07:38:12 -0400 Date: Wed, 16 May 2012 21:37:48 +1000 (EST) From: James Morris To: Linus Torvalds cc: Al Viro , Mimi Zohar , Eric Paris , Mimi Zohar , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] vfs: fix IMA lockdep circular locking dependency In-Reply-To: Message-ID: References: <1336963631-3541-1-git-send-email-zohar@us.ibm.com> <1337112446.20904.50.camel@falcor> <20120516004251.GO22082@ZenIV.linux.org.uk> User-Agent: Alpine 2.02 (LRH 1266 2009-07-14) 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: 958 Lines: 32 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? -- James Morris -- 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/