Date: Wed, 15 Oct 2014 19:05:55 +1100 (AEDT)
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
In-Reply-To: <CA+55aFwcqHx5W=tFaf0a6gb=1yH-GwARc=R0s2vwm14YBqrfhQ@mail.gmail.com>
Message-ID: <alpine.LRH.2.11.1410151901560.11622@namei.org>
References: <alpine.LRH.2.11.1410150158010.29573@namei.org> <CA+55aFzOuVhvdDActs=AXr7ZvOkHyH-M2rKVun+Q6R0=r50bvg@mail.gmail.com> <CA+55aFwcqHx5W=tFaf0a6gb=1yH-GwARc=R0s2vwm14YBqrfhQ@mail.gmail.com>
User-Agent: Alpine 2.11 (LRH 23 2013-08-11)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org

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>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/