From: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
To: zohar@linux.ibm.com, bauerman@linux.ibm.com, robh@kernel.org,
gregkh@linuxfoundation.org, james.morse@arm.com,
catalin.marinas@arm.com, sashal@kernel.org, will@kernel.org,
mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org,
robh+dt@kernel.org, frowand.list@gmail.com,
vincenzo.frascino@arm.com, mark.rutland@arm.com,
dmitry.kasatkin@gmail.com, jmorris@namei.org, serge@hallyn.com,
pasha.tatashin@soleen.com, allison@lohutok.net,
kstewart@linuxfoundation.org, takahiro.akashi@linaro.org,
tglx@linutronix.de, masahiroy@kernel.org, bhsharma@redhat.com,
mbrugger@suse.com, hsinyi@chromium.org, tao.li@vivo.com,
christophe.leroy@c-s.fr
Cc: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, prsriva@linux.microsoft.com,
balajib@linux.microsoft.com
Subject: [PATCH v9 4/8] powerpc: Use get_ima_kexec_buffer to get ima kexec buffer
Date: Fri, 13 Nov 2020 11:22:39 -0800 [thread overview]
Message-ID: <20201113192243.1993-5-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20201113192243.1993-1-nramas@linux.microsoft.com>
do_get_kexec_buffer() is called by ima_get_kexec_buffer(),
ima_free_kexec_buffer, and remove_ima_buffer() to retrieve the address
and size of the buffer used for carrying forward the IMA measurement log
across kexec system call. This function correctly handles a device
tree property that is a child node of the root node, but not anything
other than the immediate root child nodes.
Use the architecture independent function get_ima_kexec_buffer(),
defined in "drivers/of/ima_kexec.c", to get the address and size of
the IMA measurement log buffer from the device tree.
Remove do_get_kexec_buffer() since it is not used anymore.
With the above change the static function get_addr_size_cells() in
arch/powerpc/kexec/ima.c is used only by setup_ima_buffer(), which
is defined when the kernel config CONFIG_IMA_KEXEC is enabled.
Move get_addr_size_cells() under CONFIG_IMA_KEXEC.
Co-developed-by: Prakhar Srivastava <prsriva@linux.microsoft.com>
Signed-off-by: Prakhar Srivastava <prsriva@linux.microsoft.com>
Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
---
arch/powerpc/kexec/ima.c | 72 ++++++++++++----------------------------
1 file changed, 22 insertions(+), 50 deletions(-)
diff --git a/arch/powerpc/kexec/ima.c b/arch/powerpc/kexec/ima.c
index a36c39db4b1a..df491fab5d4b 100644
--- a/arch/powerpc/kexec/ima.c
+++ b/arch/powerpc/kexec/ima.c
@@ -13,40 +13,6 @@
#include <linux/libfdt.h>
#include <asm/ima.h>
-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;
-}
-
-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;
-}
-
/**
* ima_get_kexec_buffer - get IMA buffer from the previous kernel
* @addr: On successful return, set to point to the buffer contents.
@@ -56,16 +22,11 @@ static int do_get_kexec_buffer(const void *prop, int len, unsigned long *addr,
*/
int ima_get_kexec_buffer(void **addr, size_t *size)
{
- int ret, len;
+ int ret;
unsigned long tmp_addr;
size_t tmp_size;
- const void *prop;
- prop = of_get_property(of_chosen, "linux,ima-kexec-buffer", &len);
- if (!prop)
- return -ENOENT;
-
- ret = do_get_kexec_buffer(prop, len, &tmp_addr, &tmp_size);
+ ret = get_ima_kexec_buffer(NULL, 0, &tmp_addr, &tmp_size);
if (ret)
return ret;
@@ -89,7 +50,7 @@ int ima_free_kexec_buffer(void)
if (!prop)
return -ENOENT;
- ret = do_get_kexec_buffer(prop->value, prop->length, &addr, &size);
+ ret = get_ima_kexec_buffer(NULL, 0, &addr, &size);
if (ret)
return ret;
@@ -98,7 +59,6 @@ int ima_free_kexec_buffer(void)
return ret;
return memblock_free(addr, size);
-
}
/**
@@ -112,19 +72,15 @@ int ima_free_kexec_buffer(void)
*/
void remove_ima_buffer(void *fdt, int chosen_node)
{
- int ret, len;
+ int ret;
unsigned long addr;
size_t size;
- const void *prop;
- prop = fdt_getprop(fdt, chosen_node, "linux,ima-kexec-buffer", &len);
- if (!prop)
+ ret = get_ima_kexec_buffer(fdt, chosen_node, &addr, &size);
+ if (ret)
return;
- ret = do_get_kexec_buffer(prop, len, &addr, &size);
fdt_delprop(fdt, chosen_node, "linux,ima-kexec-buffer");
- if (ret)
- return;
ret = delete_fdt_mem_rsv(fdt, addr, size);
if (!ret)
@@ -132,6 +88,22 @@ void remove_ima_buffer(void *fdt, int chosen_node)
}
#ifdef CONFIG_IMA_KEXEC
+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;
+}
+
/**
* arch_ima_add_kexec_buffer - do arch-specific steps to add the IMA buffer
*
--
2.29.2
next prev parent reply other threads:[~2020-11-13 19:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 19:22 [PATCH v9 0/8] Carry forward IMA measurement log on kexec on ARM64 Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 1/8] powerpc: fix compiler warnings and errors Lakshmi Ramasubramanian
2020-12-01 3:16 ` Mimi Zohar
2020-11-13 19:22 ` [PATCH v9 2/8] powerpc: Move delete_fdt_mem_rsv() to drivers/of Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 3/8] ima: Define get_ima_kexec_buffer() in drivers/of Lakshmi Ramasubramanian
2020-12-01 11:37 ` Mimi Zohar
2020-12-01 19:01 ` Lakshmi Ramasubramanian
2020-11-13 19:22 ` Lakshmi Ramasubramanian [this message]
2020-11-13 19:22 ` [PATCH v9 5/8] powerpc: Move remove_ima_buffer() to drivers/of Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 6/8] powerpc: Move ima_get_kexec_buffer() and ima_free_kexec_buffer() to ima Lakshmi Ramasubramanian
2020-12-01 11:38 ` Mimi Zohar
2020-12-01 19:05 ` Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 7/8] arm64: Store IMA log information in kimage used for kexec Lakshmi Ramasubramanian
2020-12-01 11:39 ` Mimi Zohar
2020-12-01 19:08 ` Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 8/8] arm64: Add IMA kexec buffer to DTB Lakshmi Ramasubramanian
2020-11-21 13:57 ` [PATCH v9 0/8] Carry forward IMA measurement log on kexec on ARM64 Rob Herring
2020-11-21 14:38 ` Lakshmi Ramasubramanian
2020-11-21 19:47 ` Lakshmi Ramasubramanian
2020-12-01 11:34 ` Mimi Zohar
2020-12-01 19:10 ` Lakshmi Ramasubramanian
2020-12-01 19:15 ` Mimi Zohar
2020-12-02 2:25 ` Lakshmi Ramasubramanian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201113192243.1993-5-nramas@linux.microsoft.com \
--to=nramas@linux.microsoft.com \
--cc=allison@lohutok.net \
--cc=balajib@linux.microsoft.com \
--cc=bauerman@linux.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bhsharma@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@c-s.fr \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.kasatkin@gmail.com \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hsinyi@chromium.org \
--cc=james.morse@arm.com \
--cc=jmorris@namei.org \
--cc=kstewart@linuxfoundation.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=mbrugger@suse.com \
--cc=mpe@ellerman.id.au \
--cc=pasha.tatashin@soleen.com \
--cc=paulus@samba.org \
--cc=prsriva@linux.microsoft.com \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=sashal@kernel.org \
--cc=serge@hallyn.com \
--cc=takahiro.akashi@linaro.org \
--cc=tao.li@vivo.com \
--cc=tglx@linutronix.de \
--cc=vincenzo.frascino@arm.com \
--cc=will@kernel.org \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).