lkml.org 
[lkml]   [2012]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] vfs: fix IMA lockdep circular locking dependency
From
Date
On Wed, 2012-05-16 at 09:42 -0400, Eric Paris wrote:
> On Wed, 2012-05-16 at 21:37 +1000, 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?
>
> No. His patch works just fine without it. If you look he uses:
>
> + if (security_ops->mmap_file) {
>
> Which means since we didn't set an explicit .mmap_file, even with no
> other LSM loaded we would be fine.
>
> At the moment I'd rather stick with our usual notation of forcing
> capabilities to define every option even if all it does it return 0. If
> Linus thinks it's a good idea to do
> if (security_ops->function)
> security_ops->funtion(args);
> In the security server we should do that cleanup separately...
>
> -Eric

James was pointing out that security_fixup_ops was not set for
mmap_addr, not mmap_file(), which should be initialized by
security_fixup_ops().

Mimi




\
 
 \ /
  Last update: 2012-05-16 16:41    [from the cache]
©2003-2011 Jasper Spaans