Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eb86259 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge final set of updates from Andrew Morton:

 - a series to make IMA play better across kexec

 - a handful of random fixes

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  printk: fix typo in CONSOLE_LOGLEVEL_DEFAULT help text
  ratelimit: fix WARN_ON_RATELIMIT return value
  kcov: make kcov work properly with KASLR enabled
  arm64: setup: introduce kaslr_offset()
  mm: fadvise: avoid expensive remote LRU cache draining after FADV_DONTNEED
  ima: platform-independent hash value
  ima: define a canonical binary_runtime_measurements list format
  ima: support restoring multiple template formats
  ima: store the builtin/custom template definitions in a list
  ima: on soft reboot, save the measurement list
  powerpc: ima: send the kexec buffer to the next kernel
  ima: maintain memory size needed for serializing the measurement list
  ima: permit duplicate measurement list entries
  ima: on soft reboot, restore the measurement list
  powerpc: ima: get the kexec buffer passed by the previous kernel
parents f95adbc1 50f4d9bd

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -1441,6 +1441,10 @@ 
			The builtin appraise policy appraises all files

			owned by uid=0.



	ima_canonical_fmt [IMA]

			Use the canonical format for the binary runtime

			measurements, instead of host native format.



	ima_hash=	[IMA]

			Format: { md5 | sha1 | rmd160 | sha256 | sha384

				   | sha512 | ... }

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
config KEXEC_CORE

	bool



config HAVE_IMA_KEXEC

	bool



config OPROFILE

	tristate "OProfile system profiling"

	depends on PROFILING

arch/arm64/include/asm/memory.h

+5 −0
Original line number Diff line number Diff line
@@ -165,6 +165,11 @@ extern u64 kimage_vaddr; 
/* the offset between the kernel virtual and physical mappings */

extern u64			kimage_voffset;



static inline unsigned long kaslr_offset(void)

{

	return kimage_vaddr - KIMAGE_VADDR;

}



/*

 * Allow all memory at the discovery stage. We will clip it later.

 */

arch/arm64/kernel/setup.c

+4 −4
Original line number Diff line number Diff line
@@ -338,11 +338,11 @@ subsys_initcall(topology_init); 
static int dump_kernel_offset(struct notifier_block *self, unsigned long v,

			      void *p)

{

	u64 const kaslr_offset = kimage_vaddr - KIMAGE_VADDR;

	const unsigned long offset = kaslr_offset();



	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && kaslr_offset > 0) {

		pr_emerg("Kernel Offset: 0x%llx from 0x%lx\n",

			 kaslr_offset, KIMAGE_VADDR);

	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && offset > 0) {

		pr_emerg("Kernel Offset: 0x%lx from 0x%lx\n",

			 offset, KIMAGE_VADDR);

	} else {

		pr_emerg("Kernel Offset: disabled\n");

	}

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ config KEXEC 
config KEXEC_FILE

	bool "kexec file based system call"

	select KEXEC_CORE

	select HAVE_IMA_KEXEC

	select BUILD_BIN2C

	depends on PPC64

	depends on CRYPTO=y