linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 3/8] ima: Define get_ima_kexec_buffer() in drivers/of
Date: Fri, 13 Nov 2020 11:22:38 -0800	[thread overview]
Message-ID: <20201113192243.1993-4-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20201113192243.1993-1-nramas@linux.microsoft.com>

The function do_get_kexec_buffer(), defined in arch/powerpc/kexec/ima.c,
retrieves the address and size of the given property from the device
tree blob. This function does not have architecture specific code, but is
currently limited to powerpc. 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.

Define an architecture independent function, namely
get_ima_kexec_buffer(), in "drivers/of/ima_kexec.c". This function
retrieves the chosen node, namely "linux,ima-kexec-buffer", from
the device tree, and returns the address and size of the buffer used
for carrying forward the IMA measurement log across kexec system call.

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>
---
 drivers/of/Makefile    |  3 ++
 drivers/of/ima_kexec.c | 65 ++++++++++++++++++++++++++++++++++++++++++
 include/linux/kexec.h  | 11 +++++++
 3 files changed, 79 insertions(+)
 create mode 100644 drivers/of/ima_kexec.c

diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index 5f42aa3bbac6..5b4af994fed0 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -18,6 +18,9 @@ ifdef CONFIG_OF_FLATTREE
 ifdef CONFIG_KEXEC_FILE
 obj-y += kexec_fdt.o
 endif
+ifdef CONFIG_HAVE_IMA_KEXEC
+obj-y += ima_kexec.o
+endif
 endif
 
 obj-$(CONFIG_OF_UNITTEST) += unittest-data/
diff --git a/drivers/of/ima_kexec.c b/drivers/of/ima_kexec.c
new file mode 100644
index 000000000000..9c14777404f2
--- /dev/null
+++ b/drivers/of/ima_kexec.c
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2020 Microsoft Corporation
+ *
+ * Author: Lakshmi Ramasubramanian (nramas@linux.microsoft.com)
+ *
+ * File: ima_kexec.c
+ *	Defines functions to handle IMA measurement list across
+ *	kexec system call.
+ */
+
+#define pr_fmt(fmt)	"OF: ima-kexec: " fmt
+
+#include <linux/kernel.h>
+#include <linux/memblock.h>
+#include <linux/of.h>
+#include <linux/of_fdt.h>
+#include <linux/sizes.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/libfdt.h>
+#include <linux/kexec.h>
+
+/**
+ * get_ima_kexec_buffer - Get address and size of IMA kexec buffer
+ *
+ * @fdt: Flattened Device Tree
+ * @chosen_node: Offset of chosen node in the FDT
+ * @addr: Return address of the node
+ * @size: Return size of the node
+ */
+int get_ima_kexec_buffer(void *fdt, int chosen_node,
+			 unsigned long *addr, size_t *size)
+{
+	const void *prop;
+	int addr_cells, size_cells, prop_len;
+	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);
+
+	if (fdt)
+		prop = fdt_getprop(fdt, chosen_node,
+				   "linux,ima-kexec-buffer", &prop_len);
+	else
+		prop = of_get_property(of_chosen,
+				       "linux,ima-kexec-buffer", &prop_len);
+
+	if (!prop)
+		return -ENOENT;
+
+	if (prop_len < 4 * (addr_cells + size_cells))
+		return -EINVAL;
+
+	*addr = of_read_number(prop, addr_cells);
+	*size = of_read_number(prop + 4 * addr_cells, size_cells);
+
+	return 0;
+}
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 4ce09ccf2628..a4f248caa483 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -407,6 +407,17 @@ static inline int kexec_crash_loaded(void) { return 0; }
 #define kexec_in_progress false
 #endif /* CONFIG_KEXEC_CORE */
 
+#if defined(CONFIG_OF_FLATTREE) && defined(CONFIG_HAVE_IMA_KEXEC)
+extern int get_ima_kexec_buffer(void *fdt, int chosen_node,
+				unsigned long *addr, size_t *size);
+#else
+static inline int get_ima_kexec_buffer(void *fdt, int chosen_node,
+				       unsigned long *addr, size_t *size)
+{
+	return -EOPNOTSUPP;
+}
+#endif /* CONFIG_OF_FLATTREE && CONFIG_HAVE_IMA_KEXEC */
+
 #if defined(CONFIG_OF_FLATTREE) && defined(CONFIG_KEXEC_FILE)
 extern int delete_fdt_mem_rsv(void *fdt, unsigned long start,
 			      unsigned long size);
-- 
2.29.2


  parent reply	other threads:[~2020-11-13 19:22 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 ` Lakshmi Ramasubramanian [this message]
2020-12-01 11:37   ` [PATCH v9 3/8] ima: Define get_ima_kexec_buffer() in drivers/of Mimi Zohar
2020-12-01 19:01     ` Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 4/8] powerpc: Use get_ima_kexec_buffer to get ima kexec buffer Lakshmi Ramasubramanian
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-4-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).