Messages in this thread | | | Date | Tue, 27 Nov 2018 22:50:13 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the selinux tree with the vfs tree |
| |
Hi Ondrej,
On Tue, 27 Nov 2018 09:53:32 +0100 Ondrej Mosnacek <omosnace@redhat.com> wrote: > > Hm... seems that there was some massive overhaul in the VFS code right > at the wrong moment... There are new hooks for mounting now and the
The mount changes have been in linux-next since before the last release ...
> code that our commit changes is now here: > > https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/tree/security/selinux/hooks.c?h=for-next#n3131 > > It seems that the logic is still the same, just now our patch (or the > VFS one) needs to be updated to change the above line as such > (untested pseudo-patch): > > - if (fc->purpose == FS_CONTEXT_FOR_KERNEL_MOUNT) > + if (fc->purpose == (FS_CONTEXT_FOR_KERNEL_MOUNT|FS_CONTEXT_FOR_SUBMOUNT))
OK, so from tomorrow I will use that merge resolution. Someone needs to remember to tell Linus about this when the latter of the vfs and selinux trees reach him.
Thanks for the better resolution. -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |