From: Paul Moore <paul@paul-moore.com>
To: David Howells <dhowells@redhat.com>
Cc: "Richard Haines" <richard_c_haines@btinternet.com>,
"Stephen Rothwell" <sfr@canb.auug.org.au>,
"Stephen Smalley" <sds@tycho.nsa.gov>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Christian Göttsche" <cgzones@googlemail.com>
Subject: Re: linux-next: manual merge of the selinux tree with the keys tree
Date: Thu, 13 Feb 2020 18:02:11 -0500 [thread overview]
Message-ID: <CAHC9VhTu+SjtOx0ZZeNHkUNTrkTHtetQapqGodEkRKM=hEqFLg@mail.gmail.com> (raw)
In-Reply-To: <1d0b80d272a8e8c4a7b322d2d2bcc483d9e41a28.camel@btinternet.com>
On Wed, Feb 12, 2020 at 7:03 AM Richard Haines
<richard_c_haines@btinternet.com> wrote:
> On Wed, 2020-02-12 at 10:35 +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the selinux tree got conflicts in:
> >
> > security/selinux/include/security.h
> > security/selinux/ss/services.c
> >
> > between commit:
> >
> > 87b14da5b76a ("security/selinux: Add support for new key
> > permissions")
> >
> > from the keys tree and commit:
> >
> > 7470d0d13fb6 ("selinux: allow kernfs symlinks to inherit parent
> > directory context")
> >
> > from the selinux tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your
> > tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any
> > particularly
> > complex conflicts.
> >
>
> I think 87b14da5b76a ("security/selinux: Add support for new key
> permissions") should be revoked and resubmitted via selinux as it was
> never ack'ed there and produced before 7470d0d13fb6 ("selinux: allow
> kernfs symlinks to inherit parent directory context"), that has been
> ack'ed.
>
> Because of this the policy capability ids are out of sync with what has
> been committed in userspace libsepol.
>
> Plus as Paul mentioned there is an outstanding query on the permission
> loop that David needs to answer.
David, I see that this patch is still getting pulled into linux-next,
could you please revert it from your keys tree?
--
paul moore
www.paul-moore.com
next prev parent reply other threads:[~2020-02-13 23:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 23:35 linux-next: manual merge of the selinux tree with the keys tree Stephen Rothwell
2020-02-12 2:03 ` Paul Moore
2020-02-12 12:03 ` Richard Haines
2020-02-13 23:02 ` Paul Moore [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-12-09 23:50 Stephen Rothwell
2019-12-09 23:55 ` Paul Moore
2020-01-29 1:25 ` Stephen Rothwell
2020-01-29 2:28 ` Paul Moore
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='CAHC9VhTu+SjtOx0ZZeNHkUNTrkTHtetQapqGodEkRKM=hEqFLg@mail.gmail.com' \
--to=paul@paul-moore.com \
--cc=cgzones@googlemail.com \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=richard_c_haines@btinternet.com \
--cc=sds@tycho.nsa.gov \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).