Carry forward IMA measurement log on kexec on ARM64
Subsystems (7)
v13 cover Carry forward IMA measurement log on kexec on ARM64
On kexec file load Integrity Measurement Architecture (IMA) subsystem may verify the IMA signature of the kernel and initramfs, and measure it. The command line parameters passed to the kernel in the kexec call may also be measured by IMA. A remote attestation service can verify a TPM quote based on the TPM event log, the IMA measurement list, and the TPM PCR data. This can be achieved only if the IMA measurement log is carried over from the current kernel to the next kernel across the kexec call.
powerpc already supports carrying forward the IMA measurement log on kexec. This patch set adds support for carrying forward the IMA measurement log on kexec on ARM64.
This patch set moves the platform independent code defined for powerpc such that it can be reused for other platforms as well. A chosen node "linux,ima-kexec-buffer" is added to the DTB for ARM64 to hold the address and the size of the memory reserved to carry the IMA measurement log.
This patch set has been tested for ARM64 platform using QEMU. I would like help from the community for testing this change on powerpc. Thanks.
This patch set is based on
commit a29a64445089 ("powerpc: Use common of_kexec_setup_new_fdt()") in https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
"dt/kexec" branch.
Changelog:
v13
- Moved the arch independent functions to drivers/of/kexec.c and then refactored the code.
- Moved arch_ima_add_kexec_buffer() to security/integrity/ima/ima_kexec.c
v12
- Use fdt_appendprop_addrrange() in setup_ima_buffer() to setup the IMA measurement list property in the device tree.
- Moved architecture independent functions from "arch/powerpc/kexec/ima.c" to "drivers/of/kexec."
- Deleted "arch/powerpc/kexec/ima.c" and "arch/powerpc/include/asm/ima.h".
v11
- Rebased the changes on the kexec code refactoring done by Rob Herring in his "dt/kexec" branch
- Removed "extern" keyword in function declarations
- Removed unnecessary header files included in C files
- Updated patch descriptions per Thiago's comments
v10
- Moved delete_fdt_mem_rsv(), remove_ima_buffer(), get_ima_kexec_buffer, and get_root_addr_size_cells() to drivers/of/kexec.c
- Moved arch_ima_add_kexec_buffer() to security/integrity/ima/ima_kexec.c
- Conditionally define IMA buffer fields in struct kimage_arch
v9
- Moved delete_fdt_mem_rsv() to drivers/of/kexec_fdt.c
- Defined a new function get_ima_kexec_buffer() in drivers/of/ima_kexec.c to replace do_get_kexec_buffer()
- Changed remove_ima_kexec_buffer() to the original function name remove_ima_buffer()
- Moved remove_ima_buffer() to drivers/of/ima_kexec.c
- Moved ima_get_kexec_buffer() and ima_free_kexec_buffer() to security/integrity/ima/ima_kexec.c
v8:
- Moved remove_ima_kexec_buffer(), do_get_kexec_buffer(), and delete_fdt_mem_rsv() to drivers/of/fdt.c
- Moved ima_dump_measurement_list() and ima_add_kexec_buffer() back to security/integrity/ima/ima_kexec.c
v7:
- Renamed remove_ima_buffer() to remove_ima_kexec_buffer() and moved this function definition to kernel.
- Moved delete_fdt_mem_rsv() definition to kernel
- Moved ima_dump_measurement_list() and ima_add_kexec_buffer() to a new file namely ima_kexec_fdt.c in IMA
v6:
- Remove any existing FDT_PROP_IMA_KEXEC_BUFFER property in the device tree and also its corresponding memory reservation in the currently running kernel.
- Moved the function remove_ima_buffer() defined for powerpc to IMA and renamed the function to ima_remove_kexec_buffer(). Also, moved delete_fdt_mem_rsv() from powerpc to IMA.
v5:
- Merged get_addr_size_cells() and do_get_kexec_buffer() into a single function when moving the arch independent code from powerpc to IMA
- Reverted the change to use FDT functions in powerpc code and added back the original code in get_addr_size_cells() and do_get_kexec_buffer() for powerpc.
- Added fdt_add_mem_rsv() for ARM64 to reserve the memory for the IMA log buffer during kexec.
- Fixed the warning reported by kernel test bot for ARM64 arch_ima_add_kexec_buffer() - moved this function to a new file namely arch/arm64/kernel/ima_kexec.c
v4:
- Submitting the patch series on behalf of the original author Prakhar Srivastava <[email protected]>
- Moved FDT_PROP_IMA_KEXEC_BUFFER ("linux,ima-kexec-buffer") to libfdt.h so that it can be shared by multiple platforms.
v3:
Breakup patches further into separate patches.
- Refactoring non architecture specific code out of powerpc
- Update powerpc related code to use fdt functions
- Update IMA buffer read related code to use of functions
- Add support to store the memory information of the IMA measurement logs to be carried forward.
- Update the property strings to align with documented nodes
https://github.com/devicetree-org/dt-schema/pull/46
v2:
Break patches into separate patches.
- Powerpc related Refactoring
- Updating the docuemntation for chosen node
- Updating arm64 to support IMA buffer pass
v1:
Refactoring carrying over IMA measuremnet logs over Kexec. This patch
moves the non-architecture specific code out of powerpc and adds to security/ima.(Suggested by Thiago)
Add Documentation regarding the ima-kexec-buffer node in the chosen
node documentation
v0:
Add a layer of abstraction to use the memory reserved by device tree
for ima buffer pass.
Add support for ima buffer pass using reserved memory for arm64 kexec.
Update the arch sepcific code path in kexec file load to store the ima buffer in the reserved memory. The same reserved memory is read on kexec or cold boot.
Lakshmi Ramasubramanian (6):
ima: Move arch_ima_add_kexec_buffer() to ima
powerpc: Move arch independent ima kexec functions to
drivers/of/kexec.c
kexec: Use fdt_appendprop_addrrange() to add ima buffer to FDT
powerpc: Delete unused function delete_fdt_mem_rsv()
arm64: Free DTB buffer if fdt_open_into() fails
arm64: Add IMA log information in kimage used for kexec
arch/arm64/Kconfig | 1 + arch/arm64/include/asm/kexec.h | 5 + arch/arm64/kernel/machine_kexec_file.c | 4 +- arch/powerpc/include/asm/ima.h | 30 ---- arch/powerpc/include/asm/kexec.h | 1 - arch/powerpc/kexec/Makefile | 7 - arch/powerpc/kexec/file_load.c | 39 ----- arch/powerpc/kexec/ima.c | 219 ------------------------- drivers/of/kexec.c | 188 +++++++++++++++++++++ include/linux/of.h | 2 + security/integrity/ima/ima.h | 4 - security/integrity/ima/ima_kexec.c | 23 +++ 12 files changed, 222 insertions(+), 301 deletions(-) delete mode 100644 arch/powerpc/include/asm/ima.h delete mode 100644 arch/powerpc/kexec/ima.c
Signature · 1 line
2.29.2
PATCH v13 1/6 ima: Move arch_ima_add_kexec_buffer() to ima
arch_ima_add_kexec_buffer() defined in "arch/powerpc/kexec/ima.c" sets up the address and size of the IMA measurement list in the architecture specific fields in kimage struct. This function does not have architecture specific code, but is currently limited to powerpc.
Move arch_ima_add_kexec_buffer() to ima.
--- arch/powerpc/include/asm/ima.h | 3 --- arch/powerpc/kexec/ima.c | 17 ----------------- security/integrity/ima/ima_kexec.c | 22 ++++++++++++++++++++++ 3 files changed, 22 insertions(+), 20 deletions(-)
arch/powerpc/include/asm/ima.h +0 -3
@@ -14,9 +14,6 @@ static inline void remove_ima_buffer(void *fdt, int chosen_node) {}#endif #ifdef CONFIG_IMA_KEXEC -int arch_ima_add_kexec_buffer (struct kimage *image,unsigned long load_addr, -size_t size); -int setup_ima_buffer (const struct kimage *image,void *fdt,int chosen_node);#else static inline int setup_ima_buffer(const struct kimage *image, void *fdt,
arch/powerpc/kexec/ima.c +0 -17
@@ -128,23 +128,6 @@ void remove_ima_buffer(void *fdt, int chosen_node) }#ifdef CONFIG_IMA_KEXEC -/** -* arch_ima_add_kexec_buffer - do arch-specific steps to add the IMA buffer -* -* Architectures should use this function to pass on the IMA buffer -* information to the next kernel. -* -* Return: 0 on success, negative errno on error. -*/ -int arch_ima_add_kexec_buffer (struct kimage *image,unsigned long load_addr, -size_t size) -{ - image->arch.ima_buffer_addr = load_addr; - image->arch.ima_buffer_size = size; - -return 0 ; -} -static int write_number (void *p,u64 value,int cells) {if (cells ==1 ) {
security/integrity/ima/ima_kexec.c +22 -0
@@ -10,6 +10,7 @@#include <linux/seq_file.h> #include <linux/vmalloc.h> #include <linux/kexec.h> +#include <linux/ima.h> #include "ima.h" #ifdef CONFIG_IMA_KEXEC
@@ -71,6 +72,27 @@ static int ima_dump_measurement_list(unsigned long *buffer_size, void **buffer,return ret; } +/** +* arch_ima_add_kexec_buffer - do arch-specific steps to add the IMA buffer +* +* @image: kimage struct to set IMA buffer data +* @load_addr: Starting address where IMA buffer is loaded at +* @size: Number of bytes in the IMA buffer +* +* Architectures should use this function to pass on the IMA buffer +* information to the next kernel. +* +* Return: 0 on success, negative errno on error. +*/ +static int arch_ima_add_kexec_buffer (struct kimage *image, +unsigned long load_addr,size_t size) +{ + image->arch.ima_buffer_addr = load_addr; + image->arch.ima_buffer_size = size; + +return 0 ; +} +/* * Called during kexec_file_load so that IMA can add a segment to the kexec * image for the measurement list for the next kernel.
Signature · 1 line
2.29.2
Re: [PATCH v13 1/6] ima: Move arch_ima_add_kexec_buffer() to ima
Quoted 10 lines · Lakshmi Ramasubramanian
arch_ima_add_kexec_buffer()defined in "arch/powerpc/kexec/ima.c" sets up the address and size of the IMA measurement list in the architecture specific fields in kimage struct. This function does not have architecture specific code, but is currently limited to powerpc.Move
arch_ima_add_kexec_buffer()to ima.Co-developed-by Prakhar Srivastava <[email protected]>Signed-off-by Prakhar Srivastava <[email protected]>Signed-off-by Lakshmi Ramasubramanian <[email protected]>
Re: [PATCH v13 1/6] ima: Move arch_ima_add_kexec_buffer() to ima
In reply to Lakshmi RamasubramanianQuoted 7 lines · Lakshmi Ramasubramanian
arch_ima_add_kexec_buffer()defined in "arch/powerpc/kexec/ima.c" sets up the address and size of the IMA measurement list in the architecture specific fields in kimage struct. This function does not have architecture specific code, but is currently limited to powerpc.Move
arch_ima_add_kexec_buffer()to ima.
Quoted 8 lines
Co-developed-by Prakhar Srivastava <[email protected]>Signed-off-by Prakhar Srivastava <[email protected]>Signed-off-by Lakshmi Ramasubramanian <[email protected]>--- arch/powerpc/include/asm/ima.h | 3 --- arch/powerpc/kexec/ima.c | 17 ----------------- security/integrity/ima/ima_kexec.c | 22 ++++++++++++++++++++++ 3 files changed, 22 insertions(+), 20 deletions(-)
Just one nit below.
Also, I just noticed that this patch series hasn't been cc'd to the linuxppc-dev mailing list. You should do that, since it affects powerpc code. The powerpc maintainers are being copied so at least they've been made aware of it, but that isn't enough.
security/integrity/ima/ima_kexec.c line 16
Quoted 12 lines
security/integrity/ima/ima_kexec.c +1
-0@@ -10,6 +10,7 @@#include <linux/seq_file.h> #include <linux/vmalloc.h> #include <linux/kexec.h> +#include <linux/ima.h> #include "ima.h" #ifdef CONFIG_IMA_KEXEC
There's no need to add this include.
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
PATCH v13 2/6 powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
In reply to Lakshmi RamasubramanianThe functions defined in "arch/powerpc/kexec/ima.c" handle setting up and freeing the resources required to carry over the IMA measurement list from the current kernel to the next kernel across kexec system call. These functions do not have architecture specific code, but are currently limited to powerpc.
Move setup_ima_buffer() call into of_kexec_setup_new_fdt() defined in "drivers/of/kexec.c".
Move the remaining architecture independent functions from "arch/powerpc/kexec/ima.c" to "drivers/of/kexec.c".
Delete "arch/powerpc/kexec/ima.c" and "arch/powerpc/include/asm/ima.h". Remove references to the deleted files in powerpc and in ima.
--- arch/powerpc/include/asm/ima.h | 27 ---- arch/powerpc/kexec/Makefile | 7 - arch/powerpc/kexec/file_load.c | 7 - arch/powerpc/kexec/ima.c | 202 ------------------------- drivers/of/kexec.c | 235 +++++++++++++++++++++++++++++ include/linux/of.h | 2 + security/integrity/ima/ima.h | 4 - security/integrity/ima/ima_kexec.c | 1 + 8 files changed, 238 insertions(+), 247 deletions(-) delete mode 100644 arch/powerpc/include/asm/ima.h delete mode 100644 arch/powerpc/kexec/ima.c
arch/powerpc/include/asm/ima.h deleted +0 -27
@@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_POWERPC_IMA_H -#define _ASM_POWERPC_IMA_H - -struct kimage ; - -int ima_get_kexec_buffer (void **addr,size_t *size); -int ima_free_kexec_buffer (void ); - -#ifdef CONFIG_IMA -void remove_ima_buffer (void *fdt,int chosen_node); -#else -static inline void remove_ima_buffer (void *fdt,int chosen_node) {} -#endif - -#ifdef CONFIG_IMA_KEXEC -int setup_ima_buffer (const struct kimage *image,void *fdt,int chosen_node); -#else -static inline int setup_ima_buffer (const struct kimage *image,void *fdt, -int chosen_node) -{ -remove_ima_buffer (fdt, chosen_node); -return 0 ; -} -#endif /* CONFIG_IMA_KEXEC */ - -#endif /* _ASM_POWERPC_IMA_H */
arch/powerpc/kexec/Makefile +0 -7
@@ -9,13 +9,6 @@ obj-$(CONFIG_PPC32) += relocate_32.o obj-$(CONFIG_KEXEC_FILE) += file_load.o ranges.o file_load_$(BITS).o elf_$(BITS).o -ifdef CONFIG_HAVE_IMA_KEXEC -ifdef CONFIG_IMA -obj-y += ima.o -endif -endif - - # Disable GCOV, KCOV & sanitizers in odd or sensitive code GCOV_PROFILE_core_$(BITS).o := n KCOV_INSTRUMENT_core_$(BITS).o := n
arch/powerpc/kexec/file_load.c +0 -7
@@ -20,7 +20,6 @@#include <linux/of_fdt.h> #include <linux/libfdt.h> #include <asm/setup.h> -#include <asm/ima.h> #define SLAVE_CODE_SIZE 256/* First 0x100 bytes */
@@ -163,12 +162,6 @@ int setup_new_fdt(const struct kimage *image, void *fdt,if (ret) goto err; - ret =setup_ima_buffer (image, fdt,fdt_path_offset (fdt,"/chosen" )); -if (ret) { -pr_err ("Error setting up the new device tree.\n" ); -return ret; - } -return 0 ; err:
arch/powerpc/kexec/ima.c deleted +0 -202
202 lines not on this page · raw message
drivers/of/kexec.c +235 -0
256 lines not on this page · raw message
include/linux/of.h +2 -0
@@ -562,6 +562,8 @@ struct kimage;int of_kexec_setup_new_fdt (const struct kimage *image,void *fdt,unsigned long initrd_load_addr,unsigned long initrd_len,const char *cmdline); +int ima_get_kexec_buffer (void **addr,size_t *size); +int ima_free_kexec_buffer (void );#else /* CONFIG_OF */
security/integrity/ima/ima.h +0 -4
@@ -24,10 +24,6 @@#include "../integrity.h" -#ifdef CONFIG_HAVE_IMA_KEXEC -#include <asm/ima.h> -#endif -enum ima_show_type {IMA_SHOW_BINARY ,IMA_SHOW_BINARY_NO_FIELD_LEN ,IMA_SHOW_BINARY_OLD_STRING_FMT ,IMA_SHOW_ASCII };enum tpm_pcrs {TPM_PCR0 =0 ,TPM_PCR8 =8 ,TPM_PCR10 =10 };
security/integrity/ima/ima_kexec.c +1 -0
@@ -10,6 +10,7 @@#include <linux/seq_file.h> #include <linux/vmalloc.h> #include <linux/kexec.h> +#include <linux/of.h> #include <linux/ima.h> #include "ima.h"
Signature · 1 line
2.29.2
Mimi Zohar
maintainerRe: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
Hi Lakshmi,
Quoted 6 lines · Lakshmi Ramasubramanian
arch/powerpc/kexec/Makefile +0
-0
arch/powerpc/kexec/Makefile obj-$(CONFIG_PPC32) += relocate_32.o · line 16
Quoted 8 lines
arch/powerpc/kexec/Makefile +0
-5@@ -9,13 +9,6 @@ obj-$(CONFIG_PPC32) += relocate_32.o obj-$(CONFIG_KEXEC_FILE) += file_load.o ranges.o file_load_$(BITS).o elf_$(BITS).o -ifdef CONFIG_HAVE_IMA_KEXEC -ifdef CONFIG_IMA -obj-y += ima.o -endif -endif
Notice how "kexec/ima.o" is only included if the architecture supports it and IMA is configured. In addition only if CONFIG_IMA_KEXEC is configured, is the IMA measurement list carried across kexec. After
moving the rest of ima.c to drivers/of/kexec.c, this changes. Notice
how drivers/of/Kconfig includes kexec.o:
obj-$(CONFIG_KEXEC_FILE) += kexec.o
It is not dependent on CONFIG_HAVE_IMA_KEXEC. Shouldn't all of the functions defined in ima.c being moved to kexec.o be defined within a CONFIG_HAVE_IMA_KEXEC ifdef?
thanks,
Mimi
Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
On 12/22/20 6:26 AM, Mimi Zohar wrote:
Hi Mimi,
Quoted 23 lines · Lakshmi Ramasubramanian
Quoted 6 lines
arch/powerpc/kexec/Makefile +0
-0arch/powerpc/kexec/Makefile obj-$(CONFIG_PPC32) += relocate_32.o · line 16
Quoted 8 lines
arch/powerpc/kexec/Makefile +0
-5@@ -9,13 +9,6 @@ obj-$(CONFIG_PPC32) += relocate_32.o obj-$(CONFIG_KEXEC_FILE) += file_load.o ranges.o file_load_$(BITS).o elf_$(BITS).o -ifdef CONFIG_HAVE_IMA_KEXEC -ifdef CONFIG_IMA -obj-y += ima.o -endif -endifNotice how "
kexec/ima.o" is only included if the architecture supports it and IMA is configured. In addition only ifCONFIG_IMA_KEXECis configured, is the IMA measurement list carried across kexec. After
moving the rest ofima.ctodrivers/of/kexec.c, this changes. Notice
howdrivers/of/Kconfigincludes kexec.o:
Quoted 6 lines
obj-$(CONFIG_KEXEC_FILE) += kexec.o
It is not dependent on
CONFIG_HAVE_IMA_KEXEC. Shouldn't all of the functions defined inima.cbeing moved to kexec.o be defined within aCONFIG_HAVE_IMA_KEXECifdef?
Thanks for reviewing the changes.
In "drivers/of/kexec.c" the function remove_ima_buffer() is defined under "#ifdef CONFIG_HAVE_IMA_KEXEC"
setup_ima_buffer() is defined under "#ifdef CONFIG_IMA_KEXEC" - the same way it was defined in "arch/powerpc/kexec/ima.c".
As you know, CONFIG_IMA_KEXEC depends on CONFIG_HAVE_IMA_KEXEC (as defined in "security/integrity/ima/Kconfig").
ima_get_kexec_buffer() and ima_free_kexec_buffer() are unconditionally defined in "drivers/of/kexec.c" even though they are called only when CONFIG_HAVE_IMA_KEXEC is enabled. I will update these two functions to be moved under "#ifdef CONFIG_HAVE_IMA_KEXEC"
Rob/Mimi/Thiago - Please let me know if you have other comments in the v13 patches. Will address those as well and post v14.
thanks,
-lakshmi
Mimi Zohar
maintainerRe: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
Quoted 42 lines · Lakshmi Ramasubramanian
On 12/22/20 6:26 AM, Mimi Zohar wrote:
Hi Mimi,
Quoted 23 lines · Lakshmi Ramasubramanian
Quoted 6 lines
arch/powerpc/kexec/Makefile +0
-0arch/powerpc/kexec/Makefile obj-$(CONFIG_PPC32) += relocate_32.o · line 16
Quoted 8 lines
arch/powerpc/kexec/Makefile +0
-5@@ -9,13 +9,6 @@ obj-$(CONFIG_PPC32) += relocate_32.o obj-$(CONFIG_KEXEC_FILE) += file_load.o ranges.o file_load_$(BITS).o elf_$(BITS).o -ifdef CONFIG_HAVE_IMA_KEXEC -ifdef CONFIG_IMA -obj-y += ima.o -endif -endifNotice how "
kexec/ima.o" is only included if the architecture supports it and IMA is configured. In addition only ifCONFIG_IMA_KEXECis configured, is the IMA measurement list carried across kexec. After
moving the rest ofima.ctodrivers/of/kexec.c, this changes. Notice
howdrivers/of/Kconfigincludes kexec.o:Quoted 6 lines
obj-$(CONFIG_KEXEC_FILE) += kexec.o
It is not dependent on
CONFIG_HAVE_IMA_KEXEC. Shouldn't all of the functions defined inima.cbeing moved to kexec.o be defined within aCONFIG_HAVE_IMA_KEXECifdef?Thanks for reviewing the changes.
In "
drivers/of/kexec.c" the functionremove_ima_buffer()is defined under "#ifdefCONFIG_HAVE_IMA_KEXEC"
setup_ima_buffer()is defined under "#ifdefCONFIG_IMA_KEXEC" - the same way it was defined in "arch/powerpc/kexec/ima.c".
Quoted 7 lines
As you know,
CONFIG_IMA_KEXECdepends onCONFIG_HAVE_IMA_KEXEC(as defined in "security/integrity/ima/Kconfig").
ima_get_kexec_buffer()andima_free_kexec_buffer()are unconditionally defined in "drivers/of/kexec.c" even though they are called only whenCONFIG_HAVE_IMA_KEXECis enabled. I will update these two functions to be moved under "#ifdefCONFIG_HAVE_IMA_KEXEC"
The issue is the reverse. CONFIG_HAVE_IMA_KEXEC may be enabled without CONFIG_IMA_KEXEC being enabled. This allows the architecture to support carrying the measurement list across kexec, but requires enabling it at build time.
Only if CONFIG_HAVE_IMA_KEXEC is enabled should any of these functions be compiled at build. This allows restoring the previous IMA measurement list, even if CONFIG_IMA_KEXEC is not enabled.
Only if CONFIG_IMA_KEXEC is enabled, should carrying the measurement list across kexec be enabled. See how arch_ima_add_kexec_buffer, write_number, setup_ima_buffer are ifdef'ed in arch/powerpc/kexec/ima.c.
Mimi
Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
Quoted 56 lines · Mimi Zohar
Quoted 42 lines · Lakshmi Ramasubramanian
On 12/22/20 6:26 AM, Mimi Zohar wrote:
Hi Mimi,
Quoted 23 lines · Lakshmi Ramasubramanian
Quoted 6 lines
arch/powerpc/kexec/Makefile +0
-0arch/powerpc/kexec/Makefile obj-$(CONFIG_PPC32) += relocate_32.o · line 16
Quoted 8 lines
arch/powerpc/kexec/Makefile +0
-5@@ -9,13 +9,6 @@ obj-$(CONFIG_PPC32) += relocate_32.o obj-$(CONFIG_KEXEC_FILE) += file_load.o ranges.o file_load_$(BITS).o elf_$(BITS).o -ifdef CONFIG_HAVE_IMA_KEXEC -ifdef CONFIG_IMA -obj-y += ima.o -endif -endifNotice how "
kexec/ima.o" is only included if the architecture supports it and IMA is configured. In addition only ifCONFIG_IMA_KEXECis configured, is the IMA measurement list carried across kexec. After
moving the rest ofima.ctodrivers/of/kexec.c, this changes. Notice
howdrivers/of/Kconfigincludes kexec.o:Quoted 6 lines
obj-$(CONFIG_KEXEC_FILE) += kexec.o
It is not dependent on
CONFIG_HAVE_IMA_KEXEC. Shouldn't all of the functions defined inima.cbeing moved to kexec.o be defined within aCONFIG_HAVE_IMA_KEXECifdef?Thanks for reviewing the changes.
In "
drivers/of/kexec.c" the functionremove_ima_buffer()is defined under "#ifdefCONFIG_HAVE_IMA_KEXEC"
setup_ima_buffer()is defined under "#ifdefCONFIG_IMA_KEXEC" - the same way it was defined in "arch/powerpc/kexec/ima.c".Quoted 7 lines
As you know,
CONFIG_IMA_KEXECdepends onCONFIG_HAVE_IMA_KEXEC(as defined in "security/integrity/ima/Kconfig").
ima_get_kexec_buffer()andima_free_kexec_buffer()are unconditionally defined in "drivers/of/kexec.c" even though they are called only whenCONFIG_HAVE_IMA_KEXECis enabled. I will update these two functions to be moved under "#ifdefCONFIG_HAVE_IMA_KEXEC"The issue is the reverse.
CONFIG_HAVE_IMA_KEXECmay be enabled withoutCONFIG_IMA_KEXECbeing enabled. This allows the architecture to support carrying the measurement list across kexec, but requires enabling it at build time.
Quoted 9 lines
Only if
CONFIG_HAVE_IMA_KEXECis enabled should any of these functions be compiled at build. This allows restoring the previous IMA measurement list, even ifCONFIG_IMA_KEXECis not enabled.Only if
CONFIG_IMA_KEXECis enabled, should carrying the measurement list across kexec be enabled. See howarch_ima_add_kexec_buffer,write_number,setup_ima_bufferare ifdef'ed inarch/powerpc/kexec/ima.c.
Yes - I agree. I will make the following changes:
=> Enable the functions moved from "arch/powerpc/kexec/ima.c" to "drivers/of/kexec.c" only when CONFIG_HAVE_IMA_KEXEC is enabled.
=> Also, compile write_number() and setup_ima_buffer() only when CONFIG_IMA_KEXEC is enabled.
thanks,
-lakshmi
Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
Quoted 63 lines · Lakshmi Ramasubramanian
Quoted 49 lines · Mimi Zohar
Quoted 41 lines · Lakshmi Ramasubramanian
On 12/22/20 6:26 AM, Mimi Zohar wrote:
Hi Mimi,
Quoted 22 lines · Lakshmi Ramasubramanian
arch/powerpc/kexec/Makefile
Quoted 13 lines
arch/powerpc/kexec/Makefile +0
-0@@ -9,13 +9,6 @@ obj-$(CONFIG_PPC32) += relocate_32.o obj-$(CONFIG_KEXEC_FILE) += file_load.o ranges.ofile_load_$(BITS).o elf_$(BITS).o
-ifdefCONFIG_HAVE_IMA_KEXECarch/powerpc/kexec/Makefile +0
-4-ifdef CONFIG_IMA -obj-y += ima.o -endif -endifNotice how "
kexec/ima.o" is only included if the architecture supports it and IMA is configured. In addition only ifCONFIG_IMA_KEXECis configured, is the IMA measurement list carried across kexec. After
moving the rest ofima.ctodrivers/of/kexec.c, this changes. Notice
howdrivers/of/Kconfigincludes kexec.o:Quoted 6 lines
obj-$(CONFIG_KEXEC_FILE) += kexec.o
It is not dependent on
CONFIG_HAVE_IMA_KEXEC. Shouldn't all of the functions defined inima.cbeing moved to kexec.o be defined within aCONFIG_HAVE_IMA_KEXECifdef?Thanks for reviewing the changes.
In "
drivers/of/kexec.c" the functionremove_ima_buffer()is defined under "#ifdefCONFIG_HAVE_IMA_KEXEC"
setup_ima_buffer()is defined under "#ifdefCONFIG_IMA_KEXEC" - the same way it was defined in "arch/powerpc/kexec/ima.c".Quoted 7 lines
As you know,
CONFIG_IMA_KEXECdepends onCONFIG_HAVE_IMA_KEXEC(as defined in "security/integrity/ima/Kconfig").
ima_get_kexec_buffer()andima_free_kexec_buffer()are unconditionally defined in "drivers/of/kexec.c" even though they are called only whenCONFIG_HAVE_IMA_KEXECis enabled. I will update these two functions to be moved under "#ifdefCONFIG_HAVE_IMA_KEXEC"Quoted 12 lines
The issue is the reverse.
CONFIG_HAVE_IMA_KEXECmay be enabled withoutCONFIG_IMA_KEXECbeing enabled. This allows the architecture to support carrying the measurement list across kexec, but requires enabling it at build time.
Only ifCONFIG_HAVE_IMA_KEXECis enabled should any of these functions be compiled at build. This allows restoring the previous IMA measurement list, even ifCONFIG_IMA_KEXECis not enabled. Only ifCONFIG_IMA_KEXECis enabled, should carrying the measurement list across kexec be enabled. See howarch_ima_add_kexec_buffer,write_number,setup_ima_bufferare ifdef'ed inarch/powerpc/kexec/ima.c.
Quoted 7 lines
Yes - I agree. I will make the following changes:
=> Enable the functions moved from "
arch/powerpc/kexec/ima.c" to "drivers/of/kexec.c" only whenCONFIG_HAVE_IMA_KEXECis enabled.=> Also, compile
write_number()andsetup_ima_buffer()only whenCONFIG_IMA_KEXECis enabled.
Sounds good, with one additional change:
So far, CONFIG_HAVE_IMA_KEXEC was tested only in files that were built when CONFIG_IMA was set. With this series this is not the case anymore (in drivers/of/kexec.c). The simplest way to keep this consistent is to only enable CONFIG_HAVE_IMA_KEXEC if CONFIG_IMA is also set.
For example, with this:
arch/powerpc/Kconfig +1 -1
@@ -548,7 +548,7 @@ config KEXEC config KEXEC_FILE bool "kexec file based system call" select KEXEC_CORE - select HAVE_IMA_KEXEC + select HAVE_IMA_KEXEC if IMA select BUILD_BIN2C select KEXEC_ELF depends on PPC64
And then the same thing on the arm64 patch.
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
Quoted 97 lines · Thiago Jung Bauermann
Quoted 63 lines · Lakshmi Ramasubramanian
Quoted 49 lines · Mimi Zohar
Quoted 41 lines · Lakshmi Ramasubramanian
On 12/22/20 6:26 AM, Mimi Zohar wrote:
Hi Mimi,
Quoted 22 lines · Lakshmi Ramasubramanian
arch/powerpc/kexec/Makefile
Quoted 13 lines
arch/powerpc/kexec/Makefile +0
-0@@ -9,13 +9,6 @@ obj-$(CONFIG_PPC32) += relocate_32.o obj-$(CONFIG_KEXEC_FILE) += file_load.o ranges.ofile_load_$(BITS).o elf_$(BITS).o
-ifdefCONFIG_HAVE_IMA_KEXECarch/powerpc/kexec/Makefile +0
-4-ifdef CONFIG_IMA -obj-y += ima.o -endif -endifNotice how "
kexec/ima.o" is only included if the architecture supports it and IMA is configured. In addition only ifCONFIG_IMA_KEXECis configured, is the IMA measurement list carried across kexec. After
moving the rest ofima.ctodrivers/of/kexec.c, this changes. Notice
howdrivers/of/Kconfigincludes kexec.o:Quoted 6 lines
obj-$(CONFIG_KEXEC_FILE) += kexec.o
It is not dependent on
CONFIG_HAVE_IMA_KEXEC. Shouldn't all of the functions defined inima.cbeing moved to kexec.o be defined within aCONFIG_HAVE_IMA_KEXECifdef?Thanks for reviewing the changes.
In "
drivers/of/kexec.c" the functionremove_ima_buffer()is defined under "#ifdefCONFIG_HAVE_IMA_KEXEC"
setup_ima_buffer()is defined under "#ifdefCONFIG_IMA_KEXEC" - the same way it was defined in "arch/powerpc/kexec/ima.c".Quoted 7 lines
As you know,
CONFIG_IMA_KEXECdepends onCONFIG_HAVE_IMA_KEXEC(as defined in "security/integrity/ima/Kconfig").
ima_get_kexec_buffer()andima_free_kexec_buffer()are unconditionally defined in "drivers/of/kexec.c" even though they are called only whenCONFIG_HAVE_IMA_KEXECis enabled. I will update these two functions to be moved under "#ifdefCONFIG_HAVE_IMA_KEXEC"Quoted 12 lines
The issue is the reverse.
CONFIG_HAVE_IMA_KEXECmay be enabled withoutCONFIG_IMA_KEXECbeing enabled. This allows the architecture to support carrying the measurement list across kexec, but requires enabling it at build time.
Only ifCONFIG_HAVE_IMA_KEXECis enabled should any of these functions be compiled at build. This allows restoring the previous IMA measurement list, even ifCONFIG_IMA_KEXECis not enabled. Only ifCONFIG_IMA_KEXECis enabled, should carrying the measurement list across kexec be enabled. See howarch_ima_add_kexec_buffer,write_number,setup_ima_bufferare ifdef'ed inarch/powerpc/kexec/ima.c.Quoted 7 lines
Yes - I agree. I will make the following changes:
=> Enable the functions moved from "
arch/powerpc/kexec/ima.c" to "drivers/of/kexec.c" only whenCONFIG_HAVE_IMA_KEXECis enabled.=> Also, compile
write_number()andsetup_ima_buffer()only whenCONFIG_IMA_KEXECis enabled.Sounds good, with one additional change:
So far,
CONFIG_HAVE_IMA_KEXECwas tested only in files that were built whenCONFIG_IMAwas set. With this series this is not the case anymore (indrivers/of/kexec.c). The simplest way to keep this consistent is to only enableCONFIG_HAVE_IMA_KEXECifCONFIG_IMAis also set.For example, with this:
arch/powerpc/Kconfig +1
-1@@ -548,7 +548,7 @@ config KEXEC config KEXEC_FILE bool "kexec file based system call" select KEXEC_CORE - select HAVE_IMA_KEXEC + select HAVE_IMA_KEXEC if IMA select BUILD_BIN2C select KEXEC_ELF depends on PPC64
Quoted 1 line
And then the same thing on the arm64 patch.
This is a good idea Thiago - I will make this change in the Kconfig for both powerpc and arm64.
thanks,
-lakshmi
Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
In reply to Lakshmi RamasubramanianQuoted 17 lines · Lakshmi Ramasubramanian
The functions defined in "
arch/powerpc/kexec/ima.c" handle setting up and freeing the resources required to carry over the IMA measurement list from the current kernel to the next kernel across kexec system call. These functions do not have architecture specific code, but are currently limited to powerpc.Move
setup_ima_buffer()call intoof_kexec_setup_new_fdt()defined in "drivers/of/kexec.c".Move the remaining architecture independent functions from "
arch/powerpc/kexec/ima.c" to "drivers/of/kexec.c".
Delete "arch/powerpc/kexec/ima.c" and "arch/powerpc/include/asm/ima.h". Remove references to the deleted files in powerpc and in ima.Co-developed-by Prakhar Srivastava <[email protected]>Signed-off-by Prakhar Srivastava <[email protected]>Signed-off-by Lakshmi Ramasubramanian <[email protected]>
Quoted 12 lines
--- arch/powerpc/include/asm/ima.h | 27 ---- arch/powerpc/kexec/Makefile | 7 - arch/powerpc/kexec/file_load.c | 7 - arch/powerpc/kexec/ima.c | 202 ------------------------- drivers/of/kexec.c | 235 +++++++++++++++++++++++++++++ include/linux/of.h | 2 + security/integrity/ima/ima.h | 4 - security/integrity/ima/ima_kexec.c | 1 + 8 files changed, 238 insertions(+), 247 deletions(-) delete mode 100644 arch/powerpc/include/asm/ima.h delete mode 100644 arch/powerpc/kexec/ima.c
This looks good, provided the changes from the discussion with Mimi are made. Also, minor nits below.
Quoted 5 lines
security/integrity/ima/ima.h +0
-0
security/integrity/ima/ima.h line 29
Quoted 10 lines
security/integrity/ima/ima.h +0
-4@@ -24,10 +24,6 @@#include "../integrity.h" -#ifdef CONFIG_HAVE_IMA_KEXEC -#include <asm/ima.h> -#endif -enum ima_show_type {IMA_SHOW_BINARY ,IMA_SHOW_BINARY_NO_FIELD_LEN ,IMA_SHOW_BINARY_OLD_STRING_FMT ,IMA_SHOW_ASCII };enum tpm_pcrs {TPM_PCR0 =0 ,TPM_PCR8 =8 ,TPM_PCR10 =10 };
This belongs in patch 1.
security/integrity/ima/ima_kexec.c line 15
Quoted 11 lines
security/integrity/ima/ima_kexec.c +1
-0@@ -10,6 +10,7 @@#include <linux/seq_file.h> #include <linux/vmalloc.h> #include <linux/kexec.h> +#include <linux/of.h> #include <linux/ima.h> #include "ima.h"
This include isn't necessary.
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
Quoted 33 lines · Thiago Jung Bauermann
Quoted 27 lines · Lakshmi Ramasubramanian
The functions defined in "
arch/powerpc/kexec/ima.c" handle setting up and freeing the resources required to carry over the IMA measurement list from the current kernel to the next kernel across kexec system call. These functions do not have architecture specific code, but are currently limited to powerpc.Move
setup_ima_buffer()call intoof_kexec_setup_new_fdt()defined in "drivers/of/kexec.c".Move the remaining architecture independent functions from "
arch/powerpc/kexec/ima.c" to "drivers/of/kexec.c".
Delete "arch/powerpc/kexec/ima.c" and "arch/powerpc/include/asm/ima.h". Remove references to the deleted files in powerpc and in ima.Co-developed-by Prakhar Srivastava <[email protected]>Signed-off-by Prakhar Srivastava <[email protected]>Signed-off-by Lakshmi Ramasubramanian <[email protected]>--- arch/powerpc/include/asm/ima.h | 27 ---- arch/powerpc/kexec/Makefile | 7 - arch/powerpc/kexec/file_load.c | 7 - arch/powerpc/kexec/ima.c | 202 ------------------------- drivers/of/kexec.c | 235 +++++++++++++++++++++++++++++ include/linux/of.h | 2 + security/integrity/ima/ima.h | 4 - security/integrity/ima/ima_kexec.c | 1 + 8 files changed, 238 insertions(+), 247 deletions(-)Quoted 2 lines
delete mode 100644
arch/powerpc/include/asm/ima.hdelete mode 100644arch/powerpc/kexec/ima.c
Quoted 2 lines
This looks good, provided the changes from the discussion with Mimi are made. Also, minor nits below.
I will address the changes Mimi had stated.
Quoted 9 lines
Quoted 9 lines
security/integrity/ima/ima.h +0
-0@@ -24,10 +24,6 @@#include "../integrity.h"
Quoted 9 lines
security/integrity/ima/ima.h line 29
Quoted 7 lines
security/integrity/ima/ima.h +0
-4-#ifdef CONFIG_HAVE_IMA_KEXEC -#include <asm/ima.h> -#endif -enum ima_show_type {IMA_SHOW_BINARY ,IMA_SHOW_BINARY_NO_FIELD_LEN ,IMA_SHOW_BINARY_OLD_STRING_FMT ,IMA_SHOW_ASCII };enum tpm_pcrs {TPM_PCR0 =0 ,TPM_PCR8 =8 ,TPM_PCR10 =10 };This belongs in patch 1.
No - the reference to "asm/ima.h" cannot be removed in Patch #1 since ima_get_kexec_buffer() and ima_free_kexec_buffer() are still declared in this header. They are moved in this patch only (Patch #2).
Quoted 5 lines
Quoted 5 lines
security/integrity/ima/ima_kexec.c +0
-0@@ -10,6 +10,7 @@
Quoted 8 lines
security/integrity/ima/ima_kexec.c line 15
Quoted 6 lines
security/integrity/ima/ima_kexec.c +1
-0#include <linux/seq_file.h> #include <linux/vmalloc.h> #include <linux/kexec.h> +#include <linux/of.h> #include <linux/ima.h> #include "ima.h" This include isn't necessary.
This change is necessary because ima_get_kexec_buffer() and ima_free_kexec_buffer() are now declared in "linux/of.h".
-lakshmi
Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
Quoted 18 lines · Lakshmi Ramasubramanian
Quoted 16 lines · Thiago Jung Bauermann
security/integrity/ima/ima.h line 28
Quoted 13 lines · Lakshmi Ramasubramanian
security/integrity/ima/ima.h +0
-3@@ -24,10 +24,6 @@#include "../integrity.h" -#ifdef CONFIG_HAVE_IMA_KEXEC -#include <asm/ima.h> -#endif -enum ima_show_type {IMA_SHOW_BINARY ,IMA_SHOW_BINARY_NO_FIELD_LEN ,IMA_SHOW_BINARY_OLD_STRING_FMT ,IMA_SHOW_ASCII };enum tpm_pcrs {TPM_PCR0 =0 ,TPM_PCR8 =8 ,TPM_PCR10 =10 };This belongs in patch 1.
Quoted 3 lines
No - the reference to "
asm/ima.h" cannot be removed in Patch #1 sinceima_get_kexec_buffer()andima_free_kexec_buffer()are still declared in this header. They are moved in this patch only (Patch #2).
Indeed, you are right. My mistake.
Quoted 13 lines
Quoted 4 lines
Quoted 4 lines
security/integrity/ima/ima_kexec.c +0
-0Quoted 8 lines
security/integrity/ima/ima_kexec.c line 15
Quoted 7 lines
security/integrity/ima/ima_kexec.c +1
-0@@ -10,6 +10,7 @@#include <linux/seq_file.h> #include <linux/vmalloc.h> #include <linux/kexec.h> +#include <linux/of.h> #include <linux/ima.h> #include "ima.h" This include isn't necessary.
Quoted 2 lines
This change is necessary because
ima_get_kexec_buffer()andima_free_kexec_buffer()are now declared in "linux/of.h".
You are right here as well. Before I made the suggestion, I had tested building the kernel without the include above and it worked fine, but that's because <linux/of.h> is being included indirectly by some other header file. It's better to include it explicitly.
Signature · 7 lines
Thiago Jung Bauermann IBM Linux Technology Center _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
In reply to Lakshmi RamasubramanianActually, I have one more comment on this patch:
Quoted 15 lines · Lakshmi Ramasubramanian
arch/powerpc/kexec/file_load.c +0
-1@@ -20,7 +20,6 @@#include <linux/of_fdt.h> #include <linux/libfdt.h> #include <asm/setup.h> -#include <asm/ima.h> #define SLAVE_CODE_SIZE 256/* First 0x100 bytes */ @@ -163,12 +162,6 @@ int setup_new_fdt(const struct kimage *image, void *fdt,if (ret) goto err;
arch/powerpc/kexec/file_load.c int setup_new_fdt(const struct kimage *image, void *fdt, · line 167
Quoted 10 lines
arch/powerpc/kexec/file_load.c +0
-6- ret =setup_ima_buffer (image, fdt,fdt_path_offset (fdt,"/chosen" )); -if (ret) { -pr_err ("Error setting up the new device tree.\n" ); -return ret; - } -return 0 ; err:
With this change, setup_new_fdt() is nothing more than a call to of_kexec_setup_new_fdt(). It should be removed, and its caller should call of_kexec_setup_new_fdt() directly.
This change could be done in patch 4 of this series, to keep this patch simpler.
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
Quoted 29 lines · Thiago Jung Bauermann
Actually, I have one more comment on this patch:
Quoted 24 lines · Lakshmi Ramasubramanian
arch/powerpc/kexec/file_load.c +0
-7@@ -20,7 +20,6 @@#include <linux/of_fdt.h> #include <linux/libfdt.h> #include <asm/setup.h> -#include <asm/ima.h> #define SLAVE_CODE_SIZE 256/* First 0x100 bytes */ @@ -163,12 +162,6 @@ int setup_new_fdt(const struct kimage *image, void *fdt,if (ret) goto err; - ret =setup_ima_buffer (image, fdt,fdt_path_offset (fdt,"/chosen" )); -if (ret) { -pr_err ("Error setting up the new device tree.\n" ); -return ret; - } -return 0 ;
Quoted 9 lines
arch/powerpc/kexec/file_load.c int setup_new_fdt(const struct kimage *image, void *fdt, · line 167
Quoted 1 line
arch/powerpc/kexec/file_load.c +0
-0err:With this change,
setup_new_fdt()is nothing more than a call toof_kexec_setup_new_fdt(). It should be removed, and its caller should callof_kexec_setup_new_fdt()directly.This change could be done in patch 4 of this series, to keep this patch simpler.
Sure Thiago - I will make that change.
thanks,
-lakshmi
Rob Herring
maintainerRe: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c
In reply to Lakshmi RamasubramanianQuoted 106 lines · Lakshmi Ramasubramanian
The functions defined in "
arch/powerpc/kexec/ima.c" handle setting up and freeing the resources required to carry over the IMA measurement list from the current kernel to the next kernel across kexec system call. These functions do not have architecture specific code, but are currently limited to powerpc.Move
setup_ima_buffer()call intoof_kexec_setup_new_fdt()defined in "drivers/of/kexec.c".Move the remaining architecture independent functions from "
arch/powerpc/kexec/ima.c" to "drivers/of/kexec.c".
Delete "arch/powerpc/kexec/ima.c" and "arch/powerpc/include/asm/ima.h". Remove references to the deleted files in powerpc and in ima.Co-developed-by Prakhar Srivastava <[email protected]>Signed-off-by Prakhar Srivastava <[email protected]>Signed-off-by Lakshmi Ramasubramanian <[email protected]>--- arch/powerpc/include/asm/ima.h | 27 ---- arch/powerpc/kexec/Makefile | 7 - arch/powerpc/kexec/file_load.c | 7 - arch/powerpc/kexec/ima.c | 202 ------------------------- drivers/of/kexec.c | 235 +++++++++++++++++++++++++++++ include/linux/of.h | 2 + security/integrity/ima/ima.h | 4 - security/integrity/ima/ima_kexec.c | 1 + 8 files changed, 238 insertions(+), 247 deletions(-) delete mode 100644 arch/powerpc/include/asm/ima.h delete mode 100644 arch/powerpc/kexec/ima.cdrivers/of/kexec.c +60
-0@@ -11,6 +11,7 @@#include <linux/kernel.h> #include <linux/kexec.h> +#include <linux/memblock.h> #include <linux/libfdt.h> #include <linux/of.h> #include <linux/of_fdt.h> @@ -59,6 +60,181 @@ static int fdt_find_and_del_mem_rsv(void *fdt, unsigned long start, unsigned lonreturn -ENOENT ; } +/** +* get_addr_size_cells - Get address and size of root node +* +* @addr_cells: Return address of the root node +* @size_cells: Return size of the root node +* +* Return: 0 on success, or negative errno on error. +*/ +static int get_addr_size_cells (int *addr_cells,int *size_cells) +{ +struct device_node *root; + + root =of_find_node_by_path ("/" ); +if (!root) +return -EINVAL ; + + *addr_cells =of_n_addr_cells (root); + *size_cells =of_n_size_cells (root); + +of_node_put (root); + +return 0 ; +} + +/** +* do_get_kexec_buffer - Get address and size of device tree property +* +* @prop: Device tree property +* @len: Size of @prop +* @addr: Return address of the node +* @size: Return size of the node +* +* Return: 0 on success, or negative errno on error. +*/ +static int do_get_kexec_buffer (const void *prop,int len,unsigned long *addr, +size_t *size) +{ +int ret, addr_cells, size_cells; + + ret =get_addr_size_cells (&addr_cells, &size_cells); +if (ret) +return ret; + +if (len <4 * (addr_cells + size_cells)) +return -ENOENT ; + + *addr =of_read_number (prop, addr_cells); + *size =of_read_number (prop +4 * addr_cells, size_cells); + +return 0 ; +} + +#ifdef CONFIG_HAVE_IMA_KEXEC +/** +* remove_ima_buffer - remove the IMA buffer property and reservation from @fdt +* +* @fdt: Flattened Device Tree to update +* @chosen_node: Offset to the chosen node in the device tree +*
drivers/of/kexec.c static int fdt_find_and_del_mem_rsv(void *fdt, unsigned long start, unsigned lon · line 131
Quoted 10 lines
drivers/of/kexec.c +10
-0+* The IMA measurement buffer is of no use to a subsequent kernel, so we always +* remove it from the device tree. +*/ +static void remove_ima_buffer (void *fdt,int chosen_node) +{ +int ret, len; +unsigned long addr; +size_t size; +const void *prop; +
Should be able to do this instead of #ifdef:
if (!IS_ENABLED(CONFIG_HAVE_IMA_KEXEC))
return;
Otherwise, I think it looks good.
Rob
PATCH v13 3/6 kexec: Use fdt_appendprop_addrrange() to add ima buffer to FDT
In reply to Lakshmi Ramasubramanianfdt_appendprop_addrrange() function adds a property, with the given name, to the device tree at the given node offset, and also sets the address and size of the property. This function should be used to add "linux,ima-kexec-buffer" property to the device tree and set the address and size of the IMA measurement buffer, instead of using custom function.
Use fdt_appendprop_addrrange() to add "linux,ima-kexec-buffer" property to the device tree. This property holds the address and size of the IMA measurement buffer that needs to be passed from the current kernel to the next kernel across kexec system call.
Remove custom code that is used in setup_ima_buffer() to add "linux,ima-kexec-buffer" property to the device tree.
--- drivers/of/kexec.c | 57 ++++------------------------------------------ 1 file changed, 5 insertions(+), 52 deletions(-)
drivers/of/kexec.c +5 -52
@@ -147,36 +147,6 @@ static inline void remove_ima_buffer(void *fdt, int chosen_node) {}#endif /* CONFIG_HAVE_IMA_KEXEC */ #ifdef CONFIG_IMA_KEXEC -/** -* write_number - Convert number to big-endian format -* -* @p: Buffer to write the number to -* @value: Number to convert -* @cells: Number of cells -* -* Return: 0 on success, or negative errno on error. -*/ -static int write_number (void *p,u64 value,int cells) -{ -if (cells ==1 ) { -u32 tmp; - -if (value >U32_MAX ) -return -EINVAL ; - - tmp =cpu_to_be32 (value); -memcpy (p, &tmp,sizeof (tmp)); - }else if (cells ==2 ) { -u64 tmp; - - tmp =cpu_to_be64 (value); -memcpy (p, &tmp,sizeof (tmp)); - }else -return -EINVAL ; - -return 0 ; -} -/** * setup_ima_buffer - add IMA buffer information to the fdt * @image: kexec image being loaded.
@@ -188,32 +158,15 @@ static int write_number(void *p, u64 value, int cells)static int setup_ima_buffer (const struct kimage *image,void *fdt,int chosen_node) { -int ret, addr_cells, size_cells, entry_size; -u8 value[16 ]; +int ret;if (!image->arch.ima_buffer_size)return 0 ; - ret =get_addr_size_cells (&addr_cells, &size_cells); -if (ret) -return ret; - - entry_size =4 * (addr_cells + size_cells); - -if (entry_size >sizeof (value)) -return -EINVAL ; - - ret =write_number (value, image->arch.ima_buffer_addr, addr_cells); -if (ret) -return ret; - - ret =write_number (value +4 * addr_cells, image->arch.ima_buffer_size, - size_cells); -if (ret) -return ret; - - ret =fdt_setprop (fdt, chosen_node,"linux,ima-kexec-buffer" , value, - entry_size); + ret =fdt_appendprop_addrrange (fdt,0 , chosen_node, +"linux,ima-kexec-buffer" , + image->arch.ima_buffer_addr, + image->arch.ima_buffer_size);if (ret <0 )return -EINVAL ;
Signature · 1 line
2.29.2
Re: [PATCH v13 3/6] kexec: Use fdt_appendprop_addrrange() to add ima buffer to FDT
Quoted 14 lines · Lakshmi Ramasubramanian
fdt_appendprop_addrrange()function adds a property, with the given name, to the device tree at the given node offset, and also sets the address and size of the property. This function should be used to add "linux,ima-kexec-buffer" property to the device tree and set the address and size of the IMA measurement buffer, instead of using custom function.Use
fdt_appendprop_addrrange()to add "linux,ima-kexec-buffer" property to the device tree. This property holds the address and size of the IMA measurement buffer that needs to be passed from the current kernel to the next kernel across kexec system call.Remove custom code that is used in
setup_ima_buffer()to add "linux,ima-kexec-buffer" property to the device tree.
Quoted 6 lines
Co-developed-by Prakhar Srivastava <[email protected]>Signed-off-by Prakhar Srivastava <[email protected]>Signed-off-by Lakshmi Ramasubramanian <[email protected]>--- drivers/of/kexec.c | 57 ++++------------------------------------------ 1 file changed, 5 insertions(+), 52 deletions(-)
This is a nice improvement, thanks.
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
PATCH v13 4/6 powerpc: Delete unused function delete_fdt_mem_rsv()
In reply to Lakshmi Ramasubramaniandelete_fdt_mem_rsv() defined in "arch/powerpc/kexec/file_load.c" has been renamed to fdt_find_and_del_mem_rsv(), and moved to "drivers/of/kexec.c".
Remove delete_fdt_mem_rsv() in "arch/powerpc/kexec/file_load.c".
--- arch/powerpc/include/asm/kexec.h | 1 - arch/powerpc/kexec/file_load.c | 32 -------------------------------- 2 files changed, 33 deletions(-)
arch/powerpc/include/asm/kexec.h +0 -1
@@ -126,7 +126,6 @@ int setup_purgatory(struct kimage *image, const void *slave_code,int setup_new_fdt (const struct kimage *image,void *fdt,unsigned long initrd_load_addr,unsigned long initrd_len,const char *cmdline); -int delete_fdt_mem_rsv (void *fdt,unsigned long start,unsigned long size);#ifdef CONFIG_PPC64 struct kexec_buf ;
arch/powerpc/kexec/file_load.c +0 -32
@@ -109,38 +109,6 @@ int setup_purgatory(struct kimage *image, const void *slave_code,return 0 ; } -/** -* delete_fdt_mem_rsv - delete memory reservation with given address and size -* -* Return: 0 on success, or negative errno on error. -*/ -int delete_fdt_mem_rsv (void *fdt,unsigned long start,unsigned long size) -{ -int i, ret, num_rsvs =fdt_num_mem_rsv (fdt); - -for (i =0 ; i < num_rsvs; i++) { -uint64_t rsv_start, rsv_size; - - ret =fdt_get_mem_rsv (fdt, i, &rsv_start, &rsv_size); -if (ret) { -pr_err ("Malformed device tree.\n" ); -return -EINVAL ; - } - -if (rsv_start == start && rsv_size == size) { - ret =fdt_del_mem_rsv (fdt, i); -if (ret) { -pr_err ("Error deleting device tree reservation.\n" ); -return -EINVAL ; - } - -return 0 ; - } - } - -return -ENOENT ; -} -/* * setup_new_fdt - modify /chosen and memory reservation for the next kernel * @image: kexec image being loaded.
Signature · 1 line
2.29.2
Re: [PATCH v13 4/6] powerpc: Delete unused function delete_fdt_mem_rsv()
Quoted 6 lines · Lakshmi Ramasubramanian
delete_fdt_mem_rsv()defined in "arch/powerpc/kexec/file_load.c" has been renamed tofdt_find_and_del_mem_rsv(), and moved to "drivers/of/kexec.c".Remove
delete_fdt_mem_rsv()in "arch/powerpc/kexec/file_load.c".
Quoted 7 lines
Co-developed-by Prakhar Srivastava <[email protected]>Signed-off-by Prakhar Srivastava <[email protected]>Signed-off-by Lakshmi Ramasubramanian <[email protected]>--- arch/powerpc/include/asm/kexec.h | 1 - arch/powerpc/kexec/file_load.c | 32 -------------------------------- 2 files changed, 33 deletions(-)
As I mentioned in the other email, this patch could remove setup_new_fdt() as well.
I'm a bit ambivalent on whether this patch should be squashed with patch 2 or left on its own, but I tend toward the latter option because patch 2 is big enough already.
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
Re: [PATCH v13 4/6] powerpc: Delete unused function delete_fdt_mem_rsv()
Quoted 17 lines · Thiago Jung Bauermann
Quoted 6 lines · Lakshmi Ramasubramanian
delete_fdt_mem_rsv()defined in "arch/powerpc/kexec/file_load.c" has been renamed tofdt_find_and_del_mem_rsv(), and moved to "drivers/of/kexec.c".Remove
delete_fdt_mem_rsv()in "arch/powerpc/kexec/file_load.c".Quoted 7 lines
Co-developed-by Prakhar Srivastava <[email protected]>Signed-off-by Prakhar Srivastava <[email protected]>Signed-off-by Lakshmi Ramasubramanian <[email protected]>--- arch/powerpc/include/asm/kexec.h | 1 - arch/powerpc/kexec/file_load.c | 32 -------------------------------- 2 files changed, 33 deletions(-)
Quoted 7 lines
As I mentioned in the other email, this patch could remove
setup_new_fdt()as well.I'm a bit ambivalent on whether this patch should be squashed with patch 2 or left on its own, but I tend toward the latter option because patch 2 is big enough already.
I also think Patch #2 is already big enough - I don't want to make more changes in that patch.
I will remove delete_fdt_mem_rsv() and setup_new_fdt() in this patch (Patch #4) and call of_kexec_setup_new_fdt() directly (in setup_new_fdt_ppc64()).
thanks,
-lakshmi
PATCH v13 5/6 arm64: Free DTB buffer if fdt_open_into() fails
In reply to Lakshmi Ramasubramaniancreate_dtb() function allocates memory for the device tree blob (DTB) and calls fdt_open_into(). If this call fails the memory allocated for the DTB is not freed before returning from create_dtb() thereby leaking memory.
Call vfree() to free the memory allocated for the DTB if fdt_open_into() fails.
--- arch/arm64/kernel/machine_kexec_file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/kernel/machine_kexec_file.c +3 -1
@@ -65,8 +65,10 @@ static int create_dtb(struct kimage *image,/* duplicate a device tree blob */ ret =fdt_open_into (initial_boot_params, buf, buf_size); -if (ret) +if (ret) { +vfree (buf);return -EINVAL ; + } ret =of_kexec_setup_new_fdt (image, buf, initrd_load_addr, initrd_len, cmdline);
Signature · 1 line
2.29.2
Re: [PATCH v13 5/6] arm64: Free DTB buffer if fdt_open_into() fails
Quoted 8 lines · Lakshmi Ramasubramanian
create_dtb()function allocates memory for the device tree blob (DTB) and callsfdt_open_into(). If this call fails the memory allocated for the DTB is not freed before returning fromcreate_dtb()thereby leaking memory.Call
vfree()to free the memory allocated for the DTB iffdt_open_into()fails.
Quoted 6 lines
Co-developed-by Prakhar Srivastava <[email protected]>Signed-off-by Prakhar Srivastava <[email protected]>Signed-off-by Lakshmi Ramasubramanian <[email protected]>--- arch/arm64/kernel/machine_kexec_file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
PATCH v13 6/6 arm64: Add IMA log information in kimage used for kexec
In reply to Lakshmi RamasubramanianAddress and size of the buffer containing the IMA measurement log need to be passed from the current kernel to the next kernel on kexec.
Any existing "linux,ima-kexec-buffer" property in the device tree needs to be removed and its corresponding memory reservation in the currently running kernel needs to be freed. The address and size of the current kernel's IMA measurement log need to be added to the device tree's IMA kexec buffer node and memory for the buffer needs to be reserved for the log to be carried over to the next kernel on the kexec call.
Add address and size fields to "struct kimage_arch" for ARM64 platform to hold the address and size of the IMA measurement log buffer. Remove any existing "linux,ima-kexec-buffer" property in the device tree and free the corresponding memory reservation in the currently running kernel. Add "linux,ima-kexec-buffer" property to the device tree and reserve the memory for storing the IMA log that needs to be passed from the current kernel to the next one.
Update CONFIG_KEXEC_FILE to select CONFIG_HAVE_IMA_KEXEC to indicate that the IMA measurement log information is present in the device tree for ARM64.
--- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/kexec.h | 5 +++++ 2 files changed, 6 insertions(+)
arch/arm64/Kconfig +1 -0
@@ -1094,6 +1094,7 @@ config KEXEC config KEXEC_FILE bool "kexec file based system call" select KEXEC_CORE + select HAVE_IMA_KEXEC help This is new version of kexec system call. This system call is file based and takes file descriptors as system call argument
arch/arm64/include/asm/kexec.h +5 -0
@@ -100,6 +100,11 @@ struct kimage_arch {void *elf_headers;unsigned long elf_headers_mem;unsigned long elf_headers_sz; + +#ifdef CONFIG_IMA_KEXEC +phys_addr_t ima_buffer_addr; +size_t ima_buffer_size; +#endif };extern const struct kexec_file_ops kexec_image_ops;
Signature · 7 lines
2.29.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v13 6/6] arm64: Add IMA log information in kimage used for kexec
Quoted 36 lines · Lakshmi Ramasubramanian
Address and size of the buffer containing the IMA measurement log need to be passed from the current kernel to the next kernel on kexec.
Any existing "linux,ima-kexec-buffer" property in the device tree needs to be removed and its corresponding memory reservation in the currently running kernel needs to be freed. The address and size of the current kernel's IMA measurement log need to be added to the device tree's IMA kexec buffer node and memory for the buffer needs to be reserved for the log to be carried over to the next kernel on the kexec call.
Add address and size fields to "struct
kimage_arch" for ARM64 platform to hold the address and size of the IMA measurement log buffer. Remove any existing "linux,ima-kexec-buffer" property in the device tree and free the corresponding memory reservation in the currently running kernel. Add "linux,ima-kexec-buffer" property to the device tree and reserve the memory for storing the IMA log that needs to be passed from the current kernel to the next one.Update
CONFIG_KEXEC_FILEto selectCONFIG_HAVE_IMA_KEXECto indicate that the IMA measurement log information is present in the device tree for ARM64.Co-developed-by Prakhar Srivastava <[email protected]>Signed-off-by Prakhar Srivastava <[email protected]>Signed-off-by Lakshmi Ramasubramanian <[email protected]>--- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/kexec.h | 5 +++++ 2 files changed, 6 insertions(+)arch/arm64/Kconfig +0
-0
arch/arm64/Kconfig config KEXEC · line 1100
Quoted 7 lines
arch/arm64/Kconfig +1
-0@@ -1094,6 +1094,7 @@ config KEXEC config KEXEC_FILE bool "kexec file based system call" select KEXEC_CORE + select HAVE_IMA_KEXEC help This is new version of kexec system call. This system call is file based and takes file descriptors as system call argument
As I suggested in the other email, this should be:
select HAVE_IMA_KEXEC if IMA
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center