| Message ID | 1448325908-8185-1-git-send-email-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 24.11.2015 01:44, tim.gardner@canonical.com wrote: > The following changes since commit 03ce4b9567b96437275056cafe180c013c5ff880: > > UBUNTU: [Debian] rebuild should only trigger for non-linux packages (2015-11-20 10:24:11 -0800) > > are available in the git repository at: > > git://kernel.ubuntu.com/rtg/ubuntu-vivid.git PIE-lp1518483 > > for you to fetch changes up to 83fea90327d50b194641b71d1f67ab6106151343: > > mm: fold arch_randomize_brk into ARCH_HAS_ELF_RANDOMIZE (2015-11-23 07:48:50 -0700) > > ---------------------------------------------------------------- > Kees Cook (10): > arm: factor out mmap ASLR into mmap_rnd > x86: standardize mmap_rnd() usage > arm64: standardize mmap_rnd() usage > mips: extract logic for mmap_rnd() > powerpc: standardize mmap_rnd() usage > s390: standardize mmap_rnd() usage > mm: expose arch_mmap_rnd when available > s390: redefine randomize_et_dyn for ELF_ET_DYN_BASE > mm: split ET_DYN ASLR from mmap ASLR > mm: fold arch_randomize_brk into ARCH_HAS_ELF_RANDOMIZE Apart from the minor backport issue, the last two changes look to be the most changing and those are cherry-picks. Also positive testing in the bug report. -Stefan > > arch/Kconfig | 12 ++++ > arch/arm/Kconfig | 2 +- > arch/arm/include/asm/elf.h | 4 -- > arch/arm/mm/mmap.c | 16 ++++-- > arch/arm64/Kconfig | 2 +- > arch/arm64/include/asm/elf.h | 5 -- > arch/arm64/mm/mmap.c | 20 ++++--- > arch/mips/Kconfig | 2 +- > arch/mips/include/asm/elf.h | 4 -- > arch/mips/mm/mmap.c | 24 +++++--- > arch/powerpc/Kconfig | 2 +- > arch/powerpc/include/asm/elf.h | 4 -- > arch/powerpc/mm/mmap.c | 28 +++++---- > arch/s390/Kconfig | 1 + > arch/s390/include/asm/elf.h | 12 ++-- > arch/s390/mm/mmap.c | 128 ++++++++++++++++++++++++++++++++++++----- > arch/x86/Kconfig | 2 +- > arch/x86/include/asm/elf.h | 3 - > arch/x86/mm/mmap.c | 38 ++++++------ > fs/Kconfig.binfmt | 3 - > fs/binfmt_elf.c | 22 ++----- > include/linux/elf-randomize.h | 22 +++++++ > 22 files changed, 242 insertions(+), 114 deletions(-) > create mode 100644 include/linux/elf-randomize.h >
Applied to the master-next branch of Vivid.
The following changes since commit 03ce4b9567b96437275056cafe180c013c5ff880: UBUNTU: [Debian] rebuild should only trigger for non-linux packages (2015-11-20 10:24:11 -0800) are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-vivid.git PIE-lp1518483 for you to fetch changes up to 83fea90327d50b194641b71d1f67ab6106151343: mm: fold arch_randomize_brk into ARCH_HAS_ELF_RANDOMIZE (2015-11-23 07:48:50 -0700) ---------------------------------------------------------------- Kees Cook (10): arm: factor out mmap ASLR into mmap_rnd x86: standardize mmap_rnd() usage arm64: standardize mmap_rnd() usage mips: extract logic for mmap_rnd() powerpc: standardize mmap_rnd() usage s390: standardize mmap_rnd() usage mm: expose arch_mmap_rnd when available s390: redefine randomize_et_dyn for ELF_ET_DYN_BASE mm: split ET_DYN ASLR from mmap ASLR mm: fold arch_randomize_brk into ARCH_HAS_ELF_RANDOMIZE arch/Kconfig | 12 ++++ arch/arm/Kconfig | 2 +- arch/arm/include/asm/elf.h | 4 -- arch/arm/mm/mmap.c | 16 ++++-- arch/arm64/Kconfig | 2 +- arch/arm64/include/asm/elf.h | 5 -- arch/arm64/mm/mmap.c | 20 ++++--- arch/mips/Kconfig | 2 +- arch/mips/include/asm/elf.h | 4 -- arch/mips/mm/mmap.c | 24 +++++--- arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/elf.h | 4 -- arch/powerpc/mm/mmap.c | 28 +++++---- arch/s390/Kconfig | 1 + arch/s390/include/asm/elf.h | 12 ++-- arch/s390/mm/mmap.c | 128 ++++++++++++++++++++++++++++++++++++----- arch/x86/Kconfig | 2 +- arch/x86/include/asm/elf.h | 3 - arch/x86/mm/mmap.c | 38 ++++++------ fs/Kconfig.binfmt | 3 - fs/binfmt_elf.c | 22 ++----- include/linux/elf-randomize.h | 22 +++++++ 22 files changed, 242 insertions(+), 114 deletions(-) create mode 100644 include/linux/elf-randomize.h