Skip to contentSkip to conversation

Merge path for KSPP patches

kernel-hardening Tobin C. Harding 2 participants 2 messages Oct 30, 2017

lore
Share & tools
lore
#0 lore raw

Hi,

Does the KSP Project have a tree (and a maintainer)? I see there is this tree, but it has been idle for 6 years?

git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-hardening.git

What is the merge path for kernel hardening patches please?

I am asking this because the next merge window can't be far away. The patch hashing pointers printed with %p seems to have stabilized. This is my first _real_ patch outside of staging though so I am not completely sure of the process.

If this is overly pushy, please do say so, I'm new around here and keen to learn the correct etiquette.

thanks,
Tobin.

#1 lore raw
Quoted 4 lines · Tobin C. Harding

Does the KSP Project have a tree (and a maintainer)? I see there is this tree, but it has been idle for 6 years?

git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-hardening.git

The tree I carry for KSPP carries various things. Presently, gcc plugin and hardened usercopy changes go via that tree:

https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git/refs/heads

https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git/log/?h=for-next/gcc-plugins
https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git/log/?h=for-next/usercopy

https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git/log/?h=for-next/kspp

Quoted 1 line

What is the merge path for kernel hardening patches please?

This depends on where stuff a change is landing. For example, arch-specific things (like KASLR improvements) go via the per-architecture trees. Smaller system-wide things go via Andrew Morton's "mmotm" tree. Larger system-wide things, or things without an obvious maintainer, go via my trees.

Quoted 1 line

I am asking this because the next merge window can't be far away. The

Probably a couple weeks.

Quoted 6 lines

patch hashing pointers printed with %p seems to have stabilized. This is my first _real_ patch outside of staging though so I am not completely sure of the process.

If this is overly pushy, please do say so, I'm new around here and keen to learn the correct etiquette.

Since it's small, I think it should likely go via akpm's tree. However, I tend to carry stuff in a separate kspp tree on kernel.org just so it can get some build and run testing by the 0day bots.

-Kees

Signature · 2 lines
Kees Cook
Pixel Security