From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ondrej Mosnacek <omosnace@redhat•com>
Cc: Paul Moore <paul@paul-moore•com>,
Al Viro <viro@zeniv•linux.org.uk>,
linux-next@vger•kernel.org,
Linux kernel mailing list <linux-kernel@vger•kernel.org>,
David Howells <dhowells@redhat•com>,
selinux@vger•kernel.org, linux-fsdevel@vger•kernel.org
Subject: Re: linux-next: manual merge of the selinux tree with the vfs tree
Date: Tue, 27 Nov 2018 22:50:13 +1100 [thread overview]
Message-ID: <20181127225013.133adc7d@canb.auug.org.au> (raw)
In-Reply-To: <CAFqZXNs6XTOx2-EQ5P9bK3vPsPby7rzryHPqzqsVD9XsbsG20w@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-11-27 11:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-27 0:52 linux-next: manual merge of the selinux tree with the vfs tree Stephen Rothwell
2018-11-27 8:53 ` Ondrej Mosnacek
2018-11-27 9:14 ` Ondrej Mosnacek
2018-11-27 11:50 ` Stephen Rothwell [this message]
2018-11-28 21:52 ` Paul Moore
2018-11-29 10:07 ` Ondrej Mosnacek
2018-11-29 22:23 ` Paul Moore
2018-11-29 23:51 ` Al Viro
2018-11-30 0:57 ` Casey Schaufler
2018-11-30 1:27 ` Al Viro
2018-11-30 1:36 ` Al Viro
2018-12-01 21:32 ` Ondrej Mosnacek
2018-12-02 9:13 ` Ondrej Mosnacek
2018-12-03 10:12 ` Ondrej Mosnacek
2018-12-03 21:56 ` Al Viro
2018-12-05 9:37 ` Ondrej Mosnacek
2018-12-05 16:16 ` Al Viro
2018-12-05 21:58 ` Casey Schaufler
2018-11-30 15:10 ` David Howells
2018-11-30 15:17 ` Ondrej Mosnacek
-- strict thread matches above, loose matches on Subject: below --
2018-12-18 3:48 Stephen Rothwell
2018-12-18 4:10 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181127225013.133adc7d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-fsdevel@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=omosnace@redhat$(echo .)com \
--cc=paul@paul-moore$(echo .)com \
--cc=selinux@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox