[Skiboot] [RFC PATCH v2 6/9] secvar/storage: add draft secvar storage driver for pnor-based p9 platforms
Eric Richter
erichte at linux.ibm.com
Wed Jun 26 08:02:12 AEST 2019
This patch implements the platform specific logic for persisting the
secure variable storage banks across reboots via the SECBOOT PNOR
partition. This is a base implementation meant to provide the minimal
functionality required, and is a work-in-progress.
For POWER 9, all secure variables and updates are stored in the
in the SECBOOT PNOR partition. The partition is split into three
sections: two variable bank sections, and a section for storing
updates. For this initial implementation, the second variable bank
section is ignored, but later patches will alternate writes
between them to provide a back up in the event of a failure.
Forthcoming patches will extend this implementation to utilize the
TPM NV storage space to protect the PNOR storage from external
tampering.
NOTE: The name of this driver is subject to change, as it is not
restricted to p9 systems. Will likely change to something like
"secboot_tpm" to indicate it uses the SECBOOT partition and TPM NV
storage.
V2:
- properly set DYN_ALLOC flag after loading from pnor
- fixed "out of space" condition check in pnor writes
Signed-off-by: Eric Richter <erichte at linux.ibm.com>
---
include/secvar.h | 1 +
libstb/secvar/storage/Makefile.inc | 2 +-
libstb/secvar/storage/secboot_p9.c | 242 +++++++++++++++++++++++++++++
3 files changed, 244 insertions(+), 1 deletion(-)
create mode 100644 libstb/secvar/storage/secboot_p9.c
diff --git a/include/secvar.h b/include/secvar.h
index b5354f58..ebc5d399 100644
--- a/include/secvar.h
+++ b/include/secvar.h
@@ -41,6 +41,7 @@ struct secvar_backend_driver {
uint64_t version; // Minor version for tracking additive backend features
};
+extern struct secvar_storage_driver secboot_p9_driver;
int secvar_main(struct secvar_storage_driver, struct secvar_backend_driver);
diff --git a/libstb/secvar/storage/Makefile.inc b/libstb/secvar/storage/Makefile.inc
index c107736e..1ade3ae7 100644
--- a/libstb/secvar/storage/Makefile.inc
+++ b/libstb/secvar/storage/Makefile.inc
@@ -4,7 +4,7 @@ SECVAR_STORAGE_DIR = libstb/secvar/storage
SUBDIRS += $(SECVAR_STORAGE_DIR)
-SECVAR_STORAGE_SRCS =
+SECVAR_STORAGE_SRCS = secboot_p9.c
SECVAR_STORAGE_OBJS = $(SECVAR_STORAGE_SRCS:%.c=%.o)
SECVAR_STORAGE = $(SECVAR_STORAGE_DIR)/built-in.a
diff --git a/libstb/secvar/storage/secboot_p9.c b/libstb/secvar/storage/secboot_p9.c
new file mode 100644
index 00000000..cd884776
--- /dev/null
+++ b/libstb/secvar/storage/secboot_p9.c
@@ -0,0 +1,242 @@
+/* Copyright 2019 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef pr_fmt
+#define pr_fmt(fmt) "SECBOOT_P9: " fmt
+#endif
+
+#include <stdlib.h>
+#include <skiboot.h>
+#include <opal.h>
+#include "../secvar.h" // TODO: fix relative imports
+
+// TODO: Determine reasonable values for these
+#define SECBOOT_VARIABLE_BANK_SIZE 32000
+#define SECBOOT_UPDATE_BANK_SIZE 32000
+
+
+/* 0x5053424b = "PSBK" or Power Secure Boot Keystore */
+#define SECBOOT_MAGIC_NUMBER 0x5053424b
+#define SECBOOT_VERSION 1
+
+struct secboot_header {
+ uint32_t magic_number;
+ uint8_t version;
+ uint8_t reserved[3]; // Fix alignment
+} __packed;
+
+
+struct secboot {
+ struct secboot_header header;
+ char bank0[SECBOOT_VARIABLE_BANK_SIZE];
+ char bank1[SECBOOT_VARIABLE_BANK_SIZE];
+ char update[SECBOOT_UPDATE_BANK_SIZE];
+} __attribute__((packed));
+
+struct secboot *secboot_image;
+
+
+static int secboot_format(void)
+{
+ if (!platform.secboot_write)
+ return -1;
+
+ memset(secboot_image, 0x00, sizeof(struct secboot));
+
+ secboot_image->header.magic_number = SECBOOT_MAGIC_NUMBER;
+ secboot_image->header.version = SECBOOT_VERSION;
+
+ return platform.secboot_write(0, secboot_image, sizeof(struct secboot));
+}
+
+
+static int secboot_serialize_bank(struct list_head *bank, char *target, size_t target_size)
+{
+ struct secvar_node *node;
+ char *tmp = target;
+
+ if (!bank)
+ return -1;
+ if (!target)
+ return -1;
+
+ list_for_each(bank, node, link) {
+ // Don't persist volatile variables to flash
+ if (node->flags & SECVAR_FLAG_VOLATILE)
+ continue;
+
+ // TODO: skip over writing PK, write this to TPM in the future
+ if (node->flags & SECVAR_FLAG_SECURE_STORAGE)
+ continue;
+
+ // Bail early if we are out of storage space
+ if ((target - tmp) + sizeof(struct secvar) > target_size) {
+ return -1;
+ }
+
+ memcpy(target, node->var, sizeof(struct secvar));
+
+ target += sizeof(struct secvar);
+ }
+
+ return 0;
+}
+
+
+static int secboot_write_to_pnor(struct list_head *bank, char *target, size_t max_size)
+{
+ int ret = 0;
+
+ memset(target, 0, max_size);
+
+ ret = secboot_serialize_bank(bank, target, max_size);
+ if (ret)
+ return ret;
+
+ if (!platform.secboot_write) {
+ prlog(PR_ERR, "Failed to write: platform.secboot_write not set\n");
+ return -1;
+ }
+
+ ret = platform.secboot_write(0, secboot_image, sizeof(struct secboot));
+
+ return ret;
+}
+
+
+static int secboot_load_from_pnor(struct list_head *bank, char *source, size_t max_size)
+{
+ char *src;
+ struct secvar_node *tmp;
+ uint64_t empty = 0;
+
+ src = source;
+
+ while (src < (source + max_size)) {
+ // Peek to see if we are at the end of the bank
+ if (!memcmp(src, &empty, sizeof(empty))) {
+ break;
+ }
+
+ tmp = malloc(sizeof(struct secvar_node));
+ if (!tmp) {
+ prlog(PR_ERR, "Could not allocate memory for loading secvar from image\n");
+ return -1;
+ }
+
+ // TODO: reuse the memory here instead?
+// tmp->var = (struct secvar *) src;
+ tmp->var = zalloc(sizeof(struct secvar));
+ memcpy(tmp->var, src, sizeof(struct secvar));
+ tmp->flags |= SECVAR_FLAG_DYN_ALLOC;
+
+ list_add_tail(bank, &tmp->link);
+ src += sizeof(struct secvar);
+ }
+
+ return 0;
+}
+
+// TODO: support bank0 vs bank1
+static int secboot_p9_write_bank(struct list_head *bank, int section)
+{
+ switch(section) {
+ case SECVAR_VARIABLE_BANK:
+ return secboot_write_to_pnor(bank, secboot_image->bank0, SECBOOT_VARIABLE_BANK_SIZE);
+ case SECVAR_UPDATE_BANK:
+ return secboot_write_to_pnor(bank, secboot_image->update, SECBOOT_UPDATE_BANK_SIZE);
+ }
+
+ return OPAL_HARDWARE;
+}
+
+static int secboot_p9_load_bank(struct list_head *bank, int section)
+{
+ switch(section) {
+ case SECVAR_VARIABLE_BANK:
+ return secboot_load_from_pnor(bank, secboot_image->bank0, SECBOOT_VARIABLE_BANK_SIZE);
+ case SECVAR_UPDATE_BANK:
+ return secboot_load_from_pnor(bank, secboot_image->update, SECBOOT_UPDATE_BANK_SIZE);
+ }
+
+ return OPAL_HARDWARE;
+}
+
+
+
+static int secboot_p9_store_init(void)
+{
+ int ret;
+ unsigned secboot_size;
+
+ /* Already initialized */
+ if (secboot_image)
+ return 0;
+
+ if (!platform.secboot_info)
+ return -1;
+
+ prlog(PR_DEBUG, "Initializing for pnor-based p9 platform\n");
+
+ ret = platform.secboot_info(&secboot_size);
+ if (ret) {
+ prlog(PR_ERR, "error %d retrieving keystore info\n", ret);
+ return -1;
+ }
+ if (sizeof(struct secboot) > secboot_size) {
+ prlog(PR_ERR, "secboot partition %d KB too small. min=%ld\n",
+ secboot_size >> 10, sizeof(struct secboot));
+ return -1;
+ }
+
+ secboot_image = memalign(0x1000, sizeof(struct secboot));
+ if (!secboot_image) {
+ prlog(PR_ERR, "Failed to allocate space for the secboot image\n");
+ return -1;
+ }
+
+ /* Read it in */
+ ret = platform.secboot_read(secboot_image, 0, sizeof(struct secboot));
+ if (ret) {
+ prlog(PR_ERR, "failed to read the secboot partition, rc=%d\n", ret);
+ goto out_free;
+ }
+
+ if (secboot_image->header.magic_number != SECBOOT_MAGIC_NUMBER) {
+ prlog(PR_INFO, "Formatting secboot partition...\n");
+ ret = secboot_format();
+ if (ret) {
+ prlog(PR_ERR, "Failed to format secboot!\n");
+ goto out_free;
+ }
+ }
+
+ return 0;
+
+out_free:
+ if (secboot_image) {
+ free(secboot_image);
+ secboot_image = NULL;
+ }
+
+ return -1;
+}
+
+struct secvar_storage_driver secboot_p9_driver = {
+ .load_bank = secboot_p9_load_bank,
+ .write_bank = secboot_p9_write_bank,
+ .store_init = secboot_p9_store_init,
+};
--
2.20.1
More information about the Skiboot
mailing list