Messages in this thread | | | Date | Wed, 15 Oct 2014 19:05:55 +1100 (AEDT) | From | James Morris <> | Subject | Re: [GIT PULL] SELinux list corruption fix for 3.18 |
| |
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>
| |