From patchwork Fri Jul 10 10:18:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 235213 Delivered-To: patches@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp312441ilg; Fri, 10 Jul 2020 03:18:35 -0700 (PDT) X-Received: by 2002:a19:701:: with SMTP id 1mr42253082lfh.138.1594376315804; Fri, 10 Jul 2020 03:18:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594376315; cv=none; d=google.com; s=arc-20160816; b=J87qH6BBkQEjJzGcjVixDAGvUcl7SZk1cVPxDf01l9DAWv1nMh6RGDEsyS8NLj8Y0u 8bVgmU2MhL9XCQQ4zdMVjNhL+PpTIZfqvkYiRctbjzsY0DNZafu6AzZ/p6yrV/SF6JZ7 XNU5MmqHLKAYXTUQdEP6yb9xJuO9kmdgUor6EkZG/OlbCC/ftuVDzslwEze+kUZzgEhy L2Y7ag4CmbkyKmmXlH62UU5Rtmtf9ZvAgQjlMxde9BOPzMso9jVMtFNrcjGI66aWXbzD b49FoZEZGbLjVZAOf8cU+aNDdWs5+itMtA7POM/lO0V/IixAcl4us75yE2New+pX5lQQ u7MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=aNlhWaUWCBPVhy661vfoazTLs0ZKDar97UjH0WY+K3c=; b=eK852zeBnJ4878nEJB6cygFRfGOTly+in1d4bMF9ZLIqooYcvJaCFKUWUX2qTusUlb e3Buq5e2NCx6x0/MIp7B4sQXi+kpXgZ8AOQw8l8gQjLM11IyRYNwDsm864cONfpeF50T i5vy04CBXZ1pnQa0/r/tE0svnUkK9lHKShS+1O6I8BfV/yXiM21Sgh0LbQ+jxOZSR22t rafW8CC0zmVMR9u/nRY3jYY4uludLADuS5aqZL2O+c3ioZ4qSm5KGNvRFyfiPttZBpfc nkGlLcSfUuRFfXgAL7MFjt7M44zOA1USCVTJL5lcFLUR62aIi/pgaa5HC0vwltUaLFOI U6pA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B1vDPUKo; 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 s23sor3407800ljg.55.2020.07.10.03.18.35 for (Google Transport Security); Fri, 10 Jul 2020 03:18:35 -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=B1vDPUKo; 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:mime-version :content-transfer-encoding; bh=aNlhWaUWCBPVhy661vfoazTLs0ZKDar97UjH0WY+K3c=; b=B1vDPUKoKnVTDDpNpciAZgi50kcfqil9mM+SxWS09qJ8zJV6qOL5inFmx3sUNU0h/+ U+UyqOKwaFWkNqD1h2MrS1cFgKhFz6kGOVg/Kg4O6kBpXyiJF+SM64jgmBTBARbf2gCK FFnd0Y+617jScXRsnreCMmbuGkNZ8S253MA6MTZH2G2iy/6YodrxWLXfpyeTqL0YrhY5 M1b2wGHTdxs56wg6BNgK3/RXNFs2011undw5YV4G1GhKHyWPBqv5JnJV/Q8a/N9Am6mQ psyctBEMvtmFwZWTmpelsPgm5C8GOZe9NKxyimfxpNHhPEmcpHqh4RRfVE6KCotHz58a YgSQ== 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:mime-version :content-transfer-encoding; bh=aNlhWaUWCBPVhy661vfoazTLs0ZKDar97UjH0WY+K3c=; b=ZlV4YEQe6KSWP4t58ypHH2zSnXfda+4p/ADNbwWJYr3cS/Ea3qfvfD8PNNrzqpO6Y7 RRZSlJt52FsIhiuaUoHOa/bdl3M7z40daBavLcO+jZoTGMaHPJEn1Y76/O03zoU4fZIx FPMEvLREpnVYo8hnRY4U3B+Pcez/7Cg3/o2W2SAMdVItMiJgK4NoDCntLp6j/5Y3eFxH lDVKoqpXTVqkjKZQCeLgAtchc9akRo4Rs9pN2GlRAgafSruf5X4QgGFVQgkGdpzVCLUK 8Fy2pByZshIUUA6Z1/LDD84wGUjKWGU0Thj99+zoEE63DSrFQZPjcH7sgrsSoMMWsA+F 4YYA== X-Gm-Message-State: AOAM531R7z5BVVXD/RB3VeQmmzv9SGaEbLKBAOLekMSDkL23e6ft76kZ q7HEHqqkxlvg9Q6q3xQuPHwQCBhMIR/5lg== X-Google-Smtp-Source: ABdhPJzkx9TpkYo2DZKCGkBnZL3bjt8a/XUFApAqKawWzy/CRsiVPSvoFzptSDJTMAfRN7OgX5ekaw== X-Received: by 2002:a2e:b16c:: with SMTP id a12mr38815976ljm.146.1594376315304; Fri, 10 Jul 2020 03:18:35 -0700 (PDT) Return-Path: Received: from jade.urgonet (h-249-223.A175.priv.bahnhof.se. [98.128.249.223]) by smtp.gmail.com with ESMTPSA id w19sm1746753ljh.106.2020.07.10.03.18.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 03:18:34 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, op-tee@lists.trustedfirmware.org Cc: Cedric Neveux , Michael Whitfield , Joakim Bech , Jens Wiklander Subject: [PATCH] driver: tee: Handle NULL pointer indication from client Date: Fri, 10 Jul 2020 12:18:08 +0200 Message-Id: <20200710101808.1316522-1-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 From: Cedric Neveux TEE Client introduce a new capability "TEE_GEN_CAP_MEMREF_NULL" to handle the support of the shared memory buffer with a NULL pointer. This capability depends on TEE Capabilities and driver support. Driver and TEE exchange capabilities at driver initialization. Signed-off-by: Michael Whitfield Signed-off-by: Cedric Neveux Reviewed-by: Joakim Bech Tested-by: Joakim Bech (QEMU) Signed-off-by: Jens Wiklander --- drivers/tee/optee/core.c | 7 +++++ drivers/tee/optee/optee_smc.h | 3 +++ drivers/tee/tee_core.c | 49 ++++++++++++++++++++++------------- include/linux/tee_drv.h | 3 +++ include/uapi/linux/tee.h | 13 ++++++++++ 5 files changed, 57 insertions(+), 18 deletions(-) -- 2.25.1 diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 99698b8a3a74..8ef66e75b65e 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -215,6 +215,8 @@ static void optee_get_version(struct tee_device *teedev, if (optee->sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM) v.gen_caps |= TEE_GEN_CAP_REG_MEM; + if (optee->sec_caps & OPTEE_SMC_SEC_CAP_MEMREF_NULL) + v.gen_caps |= TEE_GEN_CAP_MEMREF_NULL; *vers = v; } @@ -246,6 +248,11 @@ static int optee_open(struct tee_context *ctx) mutex_init(&ctxdata->mutex); INIT_LIST_HEAD(&ctxdata->sess_list); + if (optee->sec_caps & OPTEE_SMC_SEC_CAP_MEMREF_NULL) + ctx->cap_memref_null = true; + else + ctx->cap_memref_null = false; + ctx->data = ctxdata; return 0; } diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h index c72122d9c997..777ad54d4c2c 100644 --- a/drivers/tee/optee/optee_smc.h +++ b/drivers/tee/optee/optee_smc.h @@ -215,6 +215,9 @@ struct optee_smc_get_shm_config_result { */ #define OPTEE_SMC_SEC_CAP_DYNAMIC_SHM BIT(2) +/* Secure world supports Shared Memory with a NULL buffer reference */ +#define OPTEE_SMC_SEC_CAP_MEMREF_NULL BIT(4) + #define OPTEE_SMC_FUNCID_EXCHANGE_CAPABILITIES 9 #define OPTEE_SMC_EXCHANGE_CAPABILITIES \ OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_EXCHANGE_CAPABILITIES) diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 64637e09a095..ce0f0309b6ac 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -383,25 +383,38 @@ static int params_from_user(struct tee_context *ctx, struct tee_param *params, case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT: case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT: /* - * If we fail to get a pointer to a shared memory - * object (and increase the ref count) from an - * identifier we return an error. All pointers that - * has been added in params have an increased ref - * count. It's the callers responibility to do - * tee_shm_put() on all resolved pointers. + * If a NULL pointer is passed to a TA in the TEE, + * the ip.c IOCTL parameters is set to TEE_MEMREF_NULL + * indicating a NULL memory reference. */ - shm = tee_shm_get_from_id(ctx, ip.c); - if (IS_ERR(shm)) - return PTR_ERR(shm); - - /* - * Ensure offset + size does not overflow offset - * and does not overflow the size of the referred - * shared memory object. - */ - if ((ip.a + ip.b) < ip.a || - (ip.a + ip.b) > shm->size) { - tee_shm_put(shm); + if (ip.c != TEE_MEMREF_NULL) { + /* + * If we fail to get a pointer to a shared + * memory object (and increase the ref count) + * from an identifier we return an error. All + * pointers that has been added in params have + * an increased ref count. It's the callers + * responibility to do tee_shm_put() on all + * resolved pointers. + */ + shm = tee_shm_get_from_id(ctx, ip.c); + if (IS_ERR(shm)) + return PTR_ERR(shm); + + /* + * Ensure offset + size does not overflow + * offset and does not overflow the size of + * the referred shared memory object. + */ + if ((ip.a + ip.b) < ip.a || + (ip.a + ip.b) > shm->size) { + tee_shm_put(shm); + return -EINVAL; + } + } else if (ctx->cap_memref_null) { + /* Pass NULL pointer to OP-TEE */ + shm = NULL; + } else { return -EINVAL; } diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index d074302989dd..cdd049a724b1 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -47,6 +47,8 @@ struct tee_shm_pool; * and just return with an error code. It is needed for requests * that arises from TEE based kernel drivers that should be * non-blocking in nature. + * @cap_memref_null: flag indicating if the TEE Client support shared + * memory buffer with a NULL pointer. */ struct tee_context { struct tee_device *teedev; @@ -54,6 +56,7 @@ struct tee_context { struct kref refcount; bool releasing; bool supp_nowait; + bool cap_memref_null; }; struct tee_param_memref { diff --git a/include/uapi/linux/tee.h b/include/uapi/linux/tee.h index b619f37ee03e..d67cadf221fc 100644 --- a/include/uapi/linux/tee.h +++ b/include/uapi/linux/tee.h @@ -51,6 +51,9 @@ #define TEE_GEN_CAP_GP (1 << 0)/* GlobalPlatform compliant TEE */ #define TEE_GEN_CAP_PRIVILEGED (1 << 1)/* Privileged device (for supplicant) */ #define TEE_GEN_CAP_REG_MEM (1 << 2)/* Supports registering shared memory */ +#define TEE_GEN_CAP_MEMREF_NULL (1 << 3)/* NULL MemRef support */ + +#define TEE_MEMREF_NULL (__u64)(-1) /* NULL MemRef Buffer */ /* * TEE Implementation ID @@ -200,6 +203,16 @@ struct tee_ioctl_buf_data { * a part of a shared memory by specifying an offset (@a) and size (@b) of * the object. To supply the entire shared memory object set the offset * (@a) to 0 and size (@b) to the previously returned size of the object. + * + * A client may need to present a NULL pointer in the argument + * passed to a trusted application in the TEE. + * This is also a requirement in GlobalPlatform Client API v1.0c + * (section 3.2.5 memory references), which can be found at + * http://www.globalplatform.org/specificationsdevice.asp + * + * If a NULL pointer is passed to a TA in the TEE, the (@c) + * IOCTL parameters value must be set to TEE_MEMREF_NULL indicating a NULL + * memory reference. */ struct tee_ioctl_param { __u64 attr;