From patchwork Mon Sep 3 14:47:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 145812 Delivered-To: patches@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2575723ljw; Mon, 3 Sep 2018 07:47:41 -0700 (PDT) X-Received: by 2002:a2e:2282:: with SMTP id i124-v6mr18831486lji.11.1535986061646; Mon, 03 Sep 2018 07:47:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535986061; cv=none; d=google.com; s=arc-20160816; b=w+RL8hT9TDY9BYXLz+4G48isec3+AaPxdM+lOUNxGp5mxUS9EpU3aSiZCrmhfqdK2M dx7u546lV2ht8/MzGp04xeKLwvCpMCXRFtHF5JVEWOxGx+k+yFpFFFk1NZcnK4CUh5UG TRwZYSPQSyxZLJXLJQhNVQnSBAp8AyMFw6dqM6BtxxCpwPfSGiH9sxwqNqgrWdJ1R8bZ 1WA/aUoCfJVXCS5xWl9HjcNeih1qnRO1GwzmtktwRZ7pVYU6edzr4jyAua0i4EuhGYIM 6y9tDXkCUPvDjCGdtyI8LR+kAyEBsOitRgCyf2fqPmavSuVXmK4Ijt+ulqtn9MEeG7Rz UP8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=DE5UbGuAWy9+9xJuZejUYyn0HTlzAq9WbDrzOK2AI20=; b=gz+1EWS3g8D/JaWu2nJgq5V7AKWR4LCfuS8a21U+B24raVZdqEuGiuaRK/s6DCFaKE JGus/fvPIchaRjrBrPKNJx4efbtrBgZQw5pd1rKxq0LxEzBAE5Cu4ntvLOuSmUD6tert ANQmEzdbMZTbVH/KZyRi4oBJrX/YIOtbgChyEtsETmyzyNr6ODQuiJGpbSJJPcs6Ft+6 7rmDe9YhA5TWVxXs9gVNZvPAsaBCne//JCVSiP+M4/7rxWYEFoWcuoijLpsg/EAKEKi0 KDKELnlF71q+GBIHeiU3xWOvC/VBeEwsgv7SlQZ7tPxaZy6/LmyH2ieYCh790DfVtksV ZiSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SyAgUHk6; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id u4-v6sor7783076lju.20.2018.09.03.07.47.41 for (Google Transport Security); Mon, 03 Sep 2018 07:47:41 -0700 (PDT) Received-SPF: pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SyAgUHk6; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DE5UbGuAWy9+9xJuZejUYyn0HTlzAq9WbDrzOK2AI20=; b=SyAgUHk6PKJs/wJ1SInHXsvsaY4iUfNtfYvirWf3YMsdbQnM9yf04f62yW3Q94qUMa 95SEezeNVoZbOX6Tia08ot6pCyZLAAfNnZfkzLKqCMZdA2jOCSIvDNc/B9DKh6CvUcRa BjKMrW6mWopq/vOzq57H77uhNErGYCdtUj5mU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DE5UbGuAWy9+9xJuZejUYyn0HTlzAq9WbDrzOK2AI20=; b=QjddXkAbF7aD3HPEgW2+uTjrlDieB/+0WcV3RgS6ZsCa97jF40ZB0CztMxmr1Wp+2Y uDlFzT1FH+H2prk1+X2ay21a2GxQOZtgdaMPfe8RgbUso7frTRznXhlm1ugNIfAwM2cr GMp4HrKiWtFuxa3mTz3fo66I7GtI9XtplDZcji/cx8ciGU21MKNrxCLrktAlThy+8/mR kzi/OnXMISZ3rLuy+mvNstQfBOkmj7bh6S+5ikXEzYPyBhmq+4eX3vwZps8FSeWjutxq O46XUaOgx6mjyuwUPpgG6Tz972FRIXMrGvbBptf5pUnYqqJ01cc1YHpZLczoTQNBDAOC gRBw== X-Gm-Message-State: APzg51B19kw/JbMUmHZ4ZJvNVnRSaW/BIoHbn2mv8ubpI3dtCyqw/ljP nBDMcMFdzjsNNrsy6hSBsWfUNoSU X-Google-Smtp-Source: ANB0VdYhLl7R/c5w/lKfJaMOmv0Mv80QrV2a7ld/+mC6Sw007M2BDXA3xnQCnlHVSfa2bkyeRLM5vw== X-Received: by 2002:a2e:80d3:: with SMTP id r19-v6mr926241ljg.85.1535986061300; Mon, 03 Sep 2018 07:47:41 -0700 (PDT) Return-Path: Received: from jax.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id w18-v6sm3343431ljd.73.2018.09.03.07.47.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Sep 2018 07:47:40 -0700 (PDT) From: Jens Wiklander To: u-boot@lists.denx.de Cc: Simon Glass , Igor Opaniuk , Tom Rini , Jaehoon Chung , Pierre Aubert , Albert Aribaud , Peter Griffin , Michal Simek , Jens Wiklander Subject: [PATCH v3 15/20] tee: add sandbox driver Date: Mon, 3 Sep 2018 16:47:06 +0200 Message-Id: <20180903144711.31585-16-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180903144711.31585-1-jens.wiklander@linaro.org> References: <20180903144711.31585-1-jens.wiklander@linaro.org> Adds a sandboxtee driver which emulates a generic TEE with the OP-TEE AVB TA. Signed-off-by: Jens Wiklander --- drivers/tee/Kconfig | 12 +- drivers/tee/Makefile | 1 + drivers/tee/optee/Kconfig | 2 +- drivers/tee/sandbox.c | 299 ++++++++++++++++++++++++++++++++++++++ include/sandboxtee.h | 15 ++ 5 files changed, 326 insertions(+), 3 deletions(-) create mode 100644 drivers/tee/sandbox.c create mode 100644 include/sandboxtee.h -- 2.17.1 Reviewed-by: Simon Glass diff --git a/drivers/tee/Kconfig b/drivers/tee/Kconfig index 835c256e9239..4697b80913d6 100644 --- a/drivers/tee/Kconfig +++ b/drivers/tee/Kconfig @@ -1,8 +1,8 @@ # Generic Trusted Execution Environment Configuration config TEE bool "Trusted Execution Environment support" - depends on ARM && (ARM64 || CPU_V7A) - select ARM_SMCCC + depends on (ARM && (ARM64 || CPU_V7A)) || SANDBOX + select ARM_SMCCC if ARM help This implements a generic interface towards a Trusted Execution Environment (TEE). A TEE is a trusted OS running in some secure @@ -14,6 +14,14 @@ if TEE menu "TEE drivers" +config SANDBOX_TEE + bool "Sandbox TEE emulator" + depends on SANDBOX + default y + help + This emulates a generic TEE needed for testing including the AVB + TA. + source "drivers/tee/optee/Kconfig" endmenu diff --git a/drivers/tee/Makefile b/drivers/tee/Makefile index 19633b60f235..f72c68c09f33 100644 --- a/drivers/tee/Makefile +++ b/drivers/tee/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0+ obj-y += tee-uclass.o +obj-$(CONFIG_SANDBOX) += sandbox.o obj-$(CONFIG_OPTEE) += optee/ diff --git a/drivers/tee/optee/Kconfig b/drivers/tee/optee/Kconfig index dbfa7846a30f..d489834df926 100644 --- a/drivers/tee/optee/Kconfig +++ b/drivers/tee/optee/Kconfig @@ -10,7 +10,7 @@ config OPTEE handle Remote Procedure Calls (RPC) from OP-TEE needed to execute a service. For more information see: https://www.op-tee.org -if OPTEE +if OPTEE || SANDBOX menu "OP-TEE options" diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c new file mode 100644 index 000000000000..cd073497615f --- /dev/null +++ b/drivers/tee/sandbox.c @@ -0,0 +1,299 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Linaro Limited + */ +#include +#include +#include +#include +#include + +/* + * The sandbox tee driver tries to emulate a generic TEE with the TA + * OPTEE_TA_AVB available. + */ + +struct ta_entry { + struct tee_optee_ta_uuid uuid; + u32 (*open_session)(uint num_params, struct tee_param *params); + u32 (*invoke_func)(u32 func, uint num_params, struct tee_param *params); +}; + +#ifdef CONFIG_OPTEE_TA_AVB +static u32 get_attr(uint n, uint num_params, struct tee_param *params) +{ + if (n >= num_params) + return TEE_PARAM_ATTR_TYPE_NONE; + + return params[n].attr; +} + +static u32 check_params(u8 p0, u8 p1, u8 p2, u8 p3, uint num_params, + struct tee_param *params) +{ + u8 p[] = { p0, p1, p2, p3}; + uint n; + + for (n = 0; n < ARRAY_SIZE(p); n++) + if (p[n] != get_attr(n, num_params, params)) + goto bad_params; + + for (; n < num_params; n++) + if (get_attr(n, num_params, params)) + goto bad_params; + + return TEE_SUCCESS; + +bad_params: + printf("Bad param attrs\n"); + + return TEE_ERROR_BAD_PARAMETERS; +} + +static u64 ta_avb_rollback_indexes[TA_AVB_MAX_ROLLBACK_LOCATIONS]; +static u32 ta_avb_lock_state; + +static u32 ta_avb_open_session(uint num_params, struct tee_param *params) +{ + /* + * We don't expect additional parameters when opening a session to + * this TA. + */ + return check_params(TEE_PARAM_ATTR_TYPE_NONE, TEE_PARAM_ATTR_TYPE_NONE, + TEE_PARAM_ATTR_TYPE_NONE, TEE_PARAM_ATTR_TYPE_NONE, + num_params, params); +} + +static u32 ta_avb_invoke_func(u32 func, uint num_params, + struct tee_param *params) +{ + u32 res; + uint slot; + u64 val; + + switch (func) { + case TA_AVB_CMD_READ_ROLLBACK_INDEX: + res = check_params(TEE_PARAM_ATTR_TYPE_VALUE_INPUT, + TEE_PARAM_ATTR_TYPE_VALUE_OUTPUT, + TEE_PARAM_ATTR_TYPE_NONE, + TEE_PARAM_ATTR_TYPE_NONE, + num_params, params); + if (res) + return res; + + slot = params[0].u.value.a; + if (slot >= ARRAY_SIZE(ta_avb_rollback_indexes)) { + printf("Rollback index slot out of bounds %lu\n", slot); + return TEE_ERROR_BAD_PARAMETERS; + } + + val = ta_avb_rollback_indexes[slot]; + params[1].u.value.a = val >> 32; + params[1].u.value.b = val; + return TEE_SUCCESS; + + case TA_AVB_CMD_WRITE_ROLLBACK_INDEX: + res = check_params(TEE_PARAM_ATTR_TYPE_VALUE_INPUT, + TEE_PARAM_ATTR_TYPE_VALUE_INPUT, + TEE_PARAM_ATTR_TYPE_NONE, + TEE_PARAM_ATTR_TYPE_NONE, + num_params, params); + if (res) + return res; + + slot = params[0].u.value.a; + if (slot >= ARRAY_SIZE(ta_avb_rollback_indexes)) { + printf("Rollback index slot out of bounds %lu\n", slot); + return TEE_ERROR_BAD_PARAMETERS; + } + + val = (u64)params[1].u.value.a << 32 | params[1].u.value.b; + if (val < ta_avb_rollback_indexes[slot]) + return TEE_ERROR_SECURITY; + + ta_avb_rollback_indexes[slot] = val; + return TEE_SUCCESS; + + case TA_AVB_CMD_READ_LOCK_STATE: + res = check_params(TEE_PARAM_ATTR_TYPE_VALUE_OUTPUT, + TEE_PARAM_ATTR_TYPE_NONE, + TEE_PARAM_ATTR_TYPE_NONE, + TEE_PARAM_ATTR_TYPE_NONE, + num_params, params); + if (res) + return res; + + params[0].u.value.a = ta_avb_lock_state; + return TEE_SUCCESS; + + case TA_AVB_CMD_WRITE_LOCK_STATE: + res = check_params(TEE_PARAM_ATTR_TYPE_VALUE_INPUT, + TEE_PARAM_ATTR_TYPE_NONE, + TEE_PARAM_ATTR_TYPE_NONE, + TEE_PARAM_ATTR_TYPE_NONE, + num_params, params); + if (res) + return res; + + if (ta_avb_lock_state != params[0].u.value.a) { + ta_avb_lock_state = params[0].u.value.a; + memset(ta_avb_rollback_indexes, 0, + sizeof(ta_avb_rollback_indexes)); + } + + return TEE_SUCCESS; + + default: + return TEE_ERROR_NOT_SUPPORTED; + } +} +#endif /*OPTEE_TA_AVB*/ + +static const struct ta_entry ta_entries[] = { +#ifdef CONFIG_OPTEE_TA_AVB + { .uuid = TA_AVB_UUID, + .open_session = ta_avb_open_session, + .invoke_func = ta_avb_invoke_func, + }, +#endif +}; + +static void sandbox_tee_get_version(struct udevice *dev, + struct tee_version_data *vers) +{ + struct tee_version_data v = { + .gen_caps = TEE_GEN_CAP_GP | TEE_GEN_CAP_REG_MEM, + }; + + *vers = v; +} + +static int sandbox_tee_close_session(struct udevice *dev, u32 session) +{ + struct sandbox_tee_state *state = dev_get_priv(dev); + + if (!state->ta || state->session != session) + return -EINVAL; + + state->session = 0; + state->ta = NULL; + + return 0; +} + +static const struct ta_entry *find_ta_entry(u8 uuid[TEE_UUID_LEN]) +{ + struct tee_optee_ta_uuid u; + uint n; + + tee_optee_ta_uuid_from_octets(&u, uuid); + + for (n = 0; n < ARRAY_SIZE(ta_entries); n++) + if (!memcmp(&u, &ta_entries[n].uuid, sizeof(u))) + return ta_entries + n; + + return NULL; +} + +static int sandbox_tee_open_session(struct udevice *dev, + struct tee_open_session_arg *arg, + uint num_params, struct tee_param *params) +{ + struct sandbox_tee_state *state = dev_get_priv(dev); + const struct ta_entry *ta; + + if (state->ta) { + printf("A session is already open\n"); + return -EBUSY; + } + + ta = find_ta_entry(arg->uuid); + if (!ta) { + printf("Cannot find TA\n"); + arg->ret = TEE_ERROR_ITEM_NOT_FOUND; + arg->ret_origin = TEE_ORIGIN_TEE; + + return 0; + } + + arg->ret = ta->open_session(num_params, params); + arg->ret_origin = TEE_ORIGIN_TRUSTED_APP; + + if (!arg->ret) { + state->ta = (void *)ta; + state->session = 1; + arg->session = state->session; + } else { + printf("Cannot open session, TA returns error\n"); + } + + return 0; +} + +static int sandbox_tee_invoke_func(struct udevice *dev, + struct tee_invoke_arg *arg, + uint num_params, struct tee_param *params) +{ + struct sandbox_tee_state *state = dev_get_priv(dev); + struct ta_entry *ta = state->ta; + + if (!arg->session) { + printf("Missing session\n"); + return -EINVAL; + } + + if (!ta) { + printf("TA session not available\n"); + return -EINVAL; + } + + if (arg->session != state->session) { + printf("Session mismatch\n"); + return -EINVAL; + } + + arg->ret = ta->invoke_func(arg->func, num_params, params); + arg->ret_origin = TEE_ORIGIN_TRUSTED_APP; + + return 0; +} + +static int sandbox_tee_shm_register(struct udevice *dev, struct tee_shm *shm) +{ + struct sandbox_tee_state *state = dev_get_priv(dev); + + state->num_shms++; + + return 0; +} + +static int sandbox_tee_shm_unregister(struct udevice *dev, struct tee_shm *shm) +{ + struct sandbox_tee_state *state = dev_get_priv(dev); + + state->num_shms--; + + return 0; +} + +static const struct tee_driver_ops sandbox_tee_ops = { + .get_version = sandbox_tee_get_version, + .open_session = sandbox_tee_open_session, + .close_session = sandbox_tee_close_session, + .invoke_func = sandbox_tee_invoke_func, + .shm_register = sandbox_tee_shm_register, + .shm_unregister = sandbox_tee_shm_unregister, +}; + +static const struct udevice_id sandbox_tee_match[] = { + { .compatible = "sandbox,tee" }, + {}, +}; + +U_BOOT_DRIVER(sandbox_tee) = { + .name = "sandbox_tee", + .id = UCLASS_TEE, + .of_match = sandbox_tee_match, + .ops = &sandbox_tee_ops, + .priv_auto_alloc_size = sizeof(struct sandbox_tee_state), +}; diff --git a/include/sandboxtee.h b/include/sandboxtee.h new file mode 100644 index 000000000000..59cbb621820b --- /dev/null +++ b/include/sandboxtee.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2018 Linaro Limited + */ + +#ifndef __SANDBOXTEE_H +#define __SANDBOXTEE_H + +struct sandbox_tee_state { + u32 session; + int num_shms; + void *ta; +}; + +#endif /*__SANDBOXTEE_H*/