* [GIT PULL] SELinux patches for 3.14
@ 2014-01-02 23:45 Paul Moore
2014-01-03 7:20 ` James Morris
2014-01-06 15:00 ` James Morris
0 siblings, 2 replies; 6+ messages in thread
From: Paul Moore @ 2014-01-02 23:45 UTC (permalink / raw)
To: James Morris; +Cc: linux-security-module, selinux
Hi James,
With 3.13-rc6 out, it looks like it is time to pass along the SELinux pull
request for 3.14. The tree below includes the patches listed here as well as
the 3.13-rcX fixes I've sent you previously (I've omitted the 3.13-rcX fixes
in the list below for the sake of clarity). Of the five new patches here, all
but Richard's patch are fixes, and minor ones at that.
On a sorta related note, over the past month or two, I've learned that my
simplistic approach to managing the SELinux tree is just a wee bit too
simplistic. After the 3.14 merge window closes I'm going to move to a branch
based approach which should make things a bit easier for everyone (okay,
mostly me) when it comes to -next and -stable.
Enjoy,
-Paul
---
The following changes since commit 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52:
Linux 3.12 (2013-11-03 15:41:51 -0800)
are available in the git repository at:
git://git.infradead.org/users/pcmoore/selinux master
----------------------------------------------------------------
Paul Moore (8):
Merge tag 'v3.12'
selinux: ensure that the cached NetLabel secattr matches the desired SID
selinux: pull address family directly from the request_sock struct
Richard Haines (1):
SELinux: Update policy version to support constraints info
Tim Gardner (1):
SELinux: security_load_policy: Silence frame-larger-than warning
Wei Yongjun (1):
SELinux: remove duplicated include from hooks.c
--
paul moore
security and virtualization @ redhat
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [GIT PULL] SELinux patches for 3.14 2014-01-02 23:45 [GIT PULL] SELinux patches for 3.14 Paul Moore @ 2014-01-03 7:20 ` James Morris 2014-01-03 13:46 ` Paul Moore 2014-01-06 15:00 ` James Morris 1 sibling, 1 reply; 6+ messages in thread From: James Morris @ 2014-01-03 7:20 UTC (permalink / raw) To: Paul Moore; +Cc: linux-security-module, selinux On Thu, 2 Jan 2014, Paul Moore wrote: > Hi James, > > With 3.13-rc6 out, it looks like it is time to pass along the SELinux pull > request for 3.14. The tree below includes the patches listed here as well as > the 3.13-rcX fixes I've sent you previously (I've omitted the 3.13-rcX fixes > in the list below for the sake of clarity). Of the five new patches here, all > but Richard's patch are fixes, and minor ones at that. > > On a sorta related note, over the past month or two, I've learned that my > simplistic approach to managing the SELinux tree is just a wee bit too > simplistic. After the 3.14 merge window closes I'm going to move to a branch > based approach which should make things a bit easier for everyone (okay, > mostly me) when it comes to -next and -stable. > > Enjoy, > -Paul > > --- > > The following changes since commit 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52: > > Linux 3.12 (2013-11-03 15:41:51 -0800) > > are available in the git repository at: > > git://git.infradead.org/users/pcmoore/selinux master Against my current next: 18952 files changed, 1930106 insertions(+), 883402 deletions(-) Looks like you rebased your main branch for the mainline fixes -- usually these are done out of band. -- James Morris <jmorris@namei.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] SELinux patches for 3.14 2014-01-03 7:20 ` James Morris @ 2014-01-03 13:46 ` Paul Moore 2014-01-03 14:03 ` James Morris 0 siblings, 1 reply; 6+ messages in thread From: Paul Moore @ 2014-01-03 13:46 UTC (permalink / raw) To: James Morris; +Cc: linux-security-module, selinux On Friday, January 03, 2014 06:20:18 PM James Morris wrote: > On Thu, 2 Jan 2014, Paul Moore wrote: > > Hi James, > > > > With 3.13-rc6 out, it looks like it is time to pass along the SELinux pull > > request for 3.14. The tree below includes the patches listed here as well > > as the 3.13-rcX fixes I've sent you previously (I've omitted the 3.13-rcX > > fixes in the list below for the sake of clarity). Of the five new > > patches here, all but Richard's patch are fixes, and minor ones at that. > > > > On a sorta related note, over the past month or two, I've learned that my > > simplistic approach to managing the SELinux tree is just a wee bit too > > simplistic. After the 3.14 merge window closes I'm going to move to a > > branch based approach which should make things a bit easier for everyone > > (okay, mostly me) when it comes to -next and -stable. > > > > Enjoy, > > -Paul > > > > --- > > > > The following changes since commit 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52: > > Linux 3.12 (2013-11-03 15:41:51 -0800) > > > > are available in the git repository at: > > git://git.infradead.org/users/pcmoore/selinux master > > Against my current next: > 18952 files changed, 1930106 insertions(+), 883402 deletions(-) > > Looks like you rebased your main branch for the mainline fixes -- usually > these are done out of band. No rebasing on my end, at least not an intentional one. If I had to guess, I suspect the large difference is due to the fact that the SELinux tree is still based off 3.12 (see the git log and my pull request mail) while it looks like your next branch is 3.12-rc2 plus a bunch of security patches. Regardless, I went ahead and grabbed your tree with the next branch, fetched the SELinux tree and cherry picked the five commits without major issue, here are the results: # git cherry-pick a660bec1d84ad19a39e380af129e207b3b8f609e [next a6b13e7] SELinux: Update policy version to support constraints info Author: Richard Haines <richard_c_haines@btinternet.com> 4 files changed, 101 insertions(+), 10 deletions(-) # git cherry-pick b5495b4217d3fa64deac479db83dbede149af7d8 [next fb3fe57] SELinux: security_load_policy: Silence frame-larger-than warning Author: Tim Gardner <tim.gardner@canonical.com> 1 file changed, 32 insertions(+), 22 deletions(-) # git cherry-pick 050d032b25e617cd738db8d6fd5aed24d87cbbcb [next c33498f] selinux: ensure that the cached NetLabel secattr matches the desired SID 1 file changed, 30 insertions(+), 1 deletion(-) # git cherry-pick 0b1f24e6db9a60c1f68117ad158ea29faa7c3a7f error: could not apply 0b1f24e... selinux: pull address family directly from the request_sock struct {... this cherry-pick required a trivial conflict resolution in security/selinux/hooks.c:selinux_inet_conn_request(), it will be obvious when you see it ... } # git cherry-pick --continue [next 1844200] selinux: pull address family directly from the request_sock struct 1 file changed, 2 insertions(+), 6 deletions(-) # git cherry-pick a5e333d34037c64c5f667dee3c418b66874ba0b0 [next ca738ab] SELinux: remove duplicated include from hooks.c Author: Wei Yongjun <yongjun_wei@trendmicro.com.cn> 1 file changed, 1 deletion(-) -- paul moore security and virtualization @ redhat ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] SELinux patches for 3.14 2014-01-03 13:46 ` Paul Moore @ 2014-01-03 14:03 ` James Morris 0 siblings, 0 replies; 6+ messages in thread From: James Morris @ 2014-01-03 14:03 UTC (permalink / raw) To: Paul Moore; +Cc: linux-security-module, selinux On Fri, 3 Jan 2014, Paul Moore wrote: > On Friday, January 03, 2014 06:20:18 PM James Morris wrote: > > On Thu, 2 Jan 2014, Paul Moore wrote: > > > Hi James, > > > > > > With 3.13-rc6 out, it looks like it is time to pass along the SELinux pull > > > request for 3.14. The tree below includes the patches listed here as well > > > as the 3.13-rcX fixes I've sent you previously (I've omitted the 3.13-rcX > > > fixes in the list below for the sake of clarity). Of the five new > > > patches here, all but Richard's patch are fixes, and minor ones at that. > > > > > > On a sorta related note, over the past month or two, I've learned that my > > > simplistic approach to managing the SELinux tree is just a wee bit too > > > simplistic. After the 3.14 merge window closes I'm going to move to a > > > branch based approach which should make things a bit easier for everyone > > > (okay, mostly me) when it comes to -next and -stable. > > > > > > Enjoy, > > > -Paul > > > > > > --- > > > > > > The following changes since commit > 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52: > > > Linux 3.12 (2013-11-03 15:41:51 -0800) > > > > > > are available in the git repository at: > > > git://git.infradead.org/users/pcmoore/selinux master > > > > Against my current next: > > 18952 files changed, 1930106 insertions(+), 883402 deletions(-) > > > > Looks like you rebased your main branch for the mainline fixes -- usually > > these are done out of band. > > No rebasing on my end, at least not an intentional one. Ok, I was looking at the wrong thing in my tree. -- James Morris <jmorris@namei.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] SELinux patches for 3.14 2014-01-02 23:45 [GIT PULL] SELinux patches for 3.14 Paul Moore 2014-01-03 7:20 ` James Morris @ 2014-01-06 15:00 ` James Morris 2014-01-06 15:05 ` Paul Moore 1 sibling, 1 reply; 6+ messages in thread From: James Morris @ 2014-01-06 15:00 UTC (permalink / raw) To: Paul Moore; +Cc: linux-security-module, selinux On Thu, 2 Jan 2014, Paul Moore wrote: > Hi James, > > With 3.13-rc6 out, it looks like it is time to pass along the SELinux pull > request for 3.14. The tree below includes the patches listed here as well as > the 3.13-rcX fixes I've sent you previously (I've omitted the 3.13-rcX fixes > in the list below for the sake of clarity). Of the five new patches here, all > but Richard's patch are fixes, and minor ones at that. > > On a sorta related note, over the past month or two, I've learned that my > simplistic approach to managing the SELinux tree is just a wee bit too > simplistic. After the 3.14 merge window closes I'm going to move to a branch > based approach which should make things a bit easier for everyone (okay, > mostly me) when it comes to -next and -stable. > > Enjoy, > -Paul > > --- > > The following changes since commit 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52: > > Linux 3.12 (2013-11-03 15:41:51 -0800) > > are available in the git repository at: > > git://git.infradead.org/users/pcmoore/selinux master I resync'd my next branch for the TPM pull, and I've now pulled your request in, too. -- James Morris <jmorris@namei.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] SELinux patches for 3.14 2014-01-06 15:00 ` James Morris @ 2014-01-06 15:05 ` Paul Moore 0 siblings, 0 replies; 6+ messages in thread From: Paul Moore @ 2014-01-06 15:05 UTC (permalink / raw) To: James Morris; +Cc: linux-security-module, selinux On Mon, Jan 6, 2014 at 10:00 AM, James Morris <jmorris@namei.org> wrote: > On Thu, 2 Jan 2014, Paul Moore wrote: > >> Hi James, >> >> With 3.13-rc6 out, it looks like it is time to pass along the SELinux pull >> request for 3.14. The tree below includes the patches listed here as well as >> the 3.13-rcX fixes I've sent you previously (I've omitted the 3.13-rcX fixes >> in the list below for the sake of clarity). Of the five new patches here, all >> but Richard's patch are fixes, and minor ones at that. >> >> On a sorta related note, over the past month or two, I've learned that my >> simplistic approach to managing the SELinux tree is just a wee bit too >> simplistic. After the 3.14 merge window closes I'm going to move to a branch >> based approach which should make things a bit easier for everyone (okay, >> mostly me) when it comes to -next and -stable. >> >> Enjoy, >> -Paul >> >> --- >> >> The following changes since commit 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52: >> >> Linux 3.12 (2013-11-03 15:41:51 -0800) >> >> are available in the git repository at: >> >> git://git.infradead.org/users/pcmoore/selinux master > > I resync'd my next branch for the TPM pull, and I've now pulled your > request in, too. Great, thanks. -- paul moore www.paul-moore.com ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-06 15:05 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-01-02 23:45 [GIT PULL] SELinux patches for 3.14 Paul Moore 2014-01-03 7:20 ` James Morris 2014-01-03 13:46 ` Paul Moore 2014-01-03 14:03 ` James Morris 2014-01-06 15:00 ` James Morris 2014-01-06 15:05 ` Paul Moore
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.