mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: James Morris <jmorris@namei.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: LSM List <linux-security-module@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Paul Moore <paul@paul-moore.com>
Subject: Re: [GIT PULL] SELinux list corruption fix for 3.18
Date: Wed, 15 Oct 2014 19:05:55 +1100 (AEDT)	[thread overview]
Message-ID: <alpine.LRH.2.11.1410151901560.11622@namei.org> (raw)
In-Reply-To: <CA+55aFwcqHx5W=tFaf0a6gb=1yH-GwARc=R0s2vwm14YBqrfhQ@mail.gmail.com>

On Wed, 15 Oct 2014, Linus Torvalds wrote:

> On Wed, Oct 15, 2014 at 7:27 AM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
> >
> > No, the log is correct (the log always is, the back-merges can cause
> > the trivial *diff* to be broken).
> 
> To add some details: the commits in there are
> 
>   f6ed66087648 Merge branch 'stable-3.18' of
> git://git.infradead.org/users/pcmoore/selinux into f
>   7c66bdc72bc3 selinux: fix inode security list corruption
>   e7387395a07d selinux: normalize audit log formatting
>   8497b78ecc9d selinux: cleanup error reporting in selinux_nlmsg_perm()
>   6eb1ddc6bd3f selinux: make the netif cache namespace aware
>   5e29532fed21 selinux: register nf hooks with single nf_register_hooks call
>   82341ad9b962 selinux: fix a problem with IPv6 traffic denials in
> selinux_ip_postroute()
>   04e8d6ab1fa6 selinux: Permit bounded transitions under NO_NEW_PRIVS or NOSUID.
> 
> and all but the list corruption fix seem to just be duplicate commits
> of things I have already gotten elsewhere. Somebody cherry-picking
> commits and duplicating them?
> 

Yep, I also already have these other changes under different commit IDs:

commit 7b0d0b40cd78cadb525df760ee4cac151533c2b5
Author: Stephen Smalley <sds@tycho.nsa.gov>
Date:   Mon Aug 4 13:36:49 2014 -0400

    selinux: Permit bounded transitions under NO_NEW_PRIVS or NOSUID.


Paul: do you have the above commit ID in your tree?

> So there are more things rotten in this tree than a back-merge.



-- 
James Morris
<jmorris@namei.org>


  reply	other threads:[~2014-10-15  8:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-14 15:05 James Morris
2014-10-15  5:27 ` Linus Torvalds
2014-10-15  5:29   ` Linus Torvalds
2014-10-15  8:05     ` James Morris [this message]
2014-10-15 14:52       ` 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=alpine.LRH.2.11.1410151901560.11622@namei.org \
    --to=jmorris@namei.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=paul@paul-moore.com \
    --cc=torvalds@linux-foundation.org \
    /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

all inboxes | Powered by JetHome®