Tee-dev

tee-dev@lists.linaro.org

1 participants
293 discussions

[PATCH -next] tee: amdtee: fix return value check in amdtee_driver_init

by Chen Zhou

Allocation function kzalloc returns NULL not ERR_PTR on failure. Replace IS_ERR with NULL check. Fixes: 757cc3e9ff1d ("tee: add AMD-TEE driver") Signed-off-by: Chen Zhou <chenzhou10(a)huawei.com> --- drivers/tee/amdtee/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tee/amdtee/core.c b/drivers/tee/amdtee/core.c index be8937e..6370bb5 100644 --- a/drivers/tee/amdtee/core.c +++ b/drivers/tee/amdtee/core.c @@ -446,11 +446,11 @@ static int __init amdtee_driver_init(void) } drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL); - if (IS_ERR(drv_data)) + if (!drv_data) return -ENOMEM; amdtee = kzalloc(sizeof(*amdtee), GFP_KERNEL); - if (IS_ERR(amdtee)) { + if (!amdtee) { rc = -ENOMEM; goto err_kfree_drv_data; } -- 2.7.4

6 years

[PATCH AUTOSEL 5.4 146/205] tee: optee: fix device enumeration error handling

by Sasha Levin

From: Jens Wiklander <jens.wiklander(a)linaro.org> [ Upstream commit 03212e347f9443e524d6383c6806ac08295c1fb0 ] Prior to this patch in optee_probe() when optee_enumerate_devices() was called the struct optee was fully initialized. If optee_enumerate_devices() returns an error optee_probe() is supposed to clean up and free the struct optee completely, but will at this late stage need to call optee_remove() instead. This isn't done and thus freeing the struct optee prematurely. With this patch the call to optee_enumerate_devices() is done after optee_probe() has returned successfully and in case optee_enumerate_devices() fails everything is cleaned up with a call to optee_remove(). Fixes: c3fa24af9244 ("tee: optee: add TEE bus device enumeration support") Reviewed-by: Sumit Garg <sumit.garg(a)linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/tee/optee/core.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 1854a3db7345..b830e0a87fba 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -643,11 +643,6 @@ static struct optee *optee_probe(struct device_node *np) if (optee->sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM) pr_info("dynamic shared memory is enabled\n"); - rc = optee_enumerate_devices(); - if (rc) - goto err; - - pr_info("initialized driver\n"); return optee; err: if (optee) { @@ -702,9 +697,10 @@ static struct optee *optee_svc; static int __init optee_driver_init(void) { - struct device_node *fw_np; - struct device_node *np; - struct optee *optee; + struct device_node *fw_np = NULL; + struct device_node *np = NULL; + struct optee *optee = NULL; + int rc = 0; /* Node is supposed to be below /firmware */ fw_np = of_find_node_by_name(NULL, "firmware"); @@ -723,6 +719,14 @@ static int __init optee_driver_init(void) if (IS_ERR(optee)) return PTR_ERR(optee); + rc = optee_enumerate_devices(); + if (rc) { + optee_remove(optee); + return rc; + } + + pr_info("initialized driver\n"); + optee_svc = optee; return 0; -- 2.20.1

6 years

[PATCH AUTOSEL 5.4 145/205] tee: optee: Fix dynamic shm pool allocations

by Sasha Levin

From: Sumit Garg <sumit.garg(a)linaro.org> [ Upstream commit a249dd200d03791cab23e47571f3e13d9c72af6c ] In case of dynamic shared memory pool, kernel memory allocated using dmabuf_mgr pool needs to be registered with OP-TEE prior to its usage during optee_open_session() or optee_invoke_func(). So fix dmabuf_mgr pool allocations via an additional call to optee_shm_register(). Also, allow kernel pages to be registered as shared memory with OP-TEE. Fixes: 9733b072a12a ("optee: allow to work without static shared memory") Signed-off-by: Sumit Garg <sumit.garg(a)linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/tee/optee/call.c | 7 +++++++ drivers/tee/optee/shm_pool.c | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index 13b0269a0abc..cf2367ba08d6 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -554,6 +554,13 @@ static int check_mem_type(unsigned long start, size_t num_pages) struct mm_struct *mm = current->mm; int rc; + /* + * Allow kernel address to register with OP-TEE as kernel + * pages are configured as normal memory only. + */ + if (virt_addr_valid(start)) + return 0; + down_read(&mm->mmap_sem); rc = __check_mem_type(find_vma(mm, start), start + num_pages * PAGE_SIZE); diff --git a/drivers/tee/optee/shm_pool.c b/drivers/tee/optee/shm_pool.c index de1d9b8fad90..0332a5301d61 100644 --- a/drivers/tee/optee/shm_pool.c +++ b/drivers/tee/optee/shm_pool.c @@ -17,6 +17,7 @@ static int pool_op_alloc(struct tee_shm_pool_mgr *poolm, { unsigned int order = get_order(size); struct page *page; + int rc = 0; page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order); if (!page) @@ -26,12 +27,21 @@ static int pool_op_alloc(struct tee_shm_pool_mgr *poolm, shm->paddr = page_to_phys(page); shm->size = PAGE_SIZE << order; - return 0; + if (shm->flags & TEE_SHM_DMA_BUF) { + shm->flags |= TEE_SHM_REGISTER; + rc = optee_shm_register(shm->ctx, shm, &page, 1 << order, + (unsigned long)shm->kaddr); + } + + return rc; } static void pool_op_free(struct tee_shm_pool_mgr *poolm, struct tee_shm *shm) { + if (shm->flags & TEE_SHM_DMA_BUF) + optee_shm_unregister(shm->ctx, shm); + free_pages((unsigned long)shm->kaddr, get_order(shm->size)); shm->kaddr = NULL; } -- 2.20.1

6 years

[PATCH][next][resend] tee: fix memory allocation failure checks on drv_data and amdtee

by Colin King

From: Colin Ian King <colin.king(a)canonical.com> Currently the memory allocation failure checks on drv_data and amdtee are using IS_ERR rather than checking for a null pointer. Fix these checks to use the conventional null pointer check. Addresses-Coverity: ("Dereference null return") Fixes: 757cc3e9ff1d ("tee: add AMD-TEE driver") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/tee/amdtee/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tee/amdtee/core.c b/drivers/tee/amdtee/core.c index 9d0cee1c837f..5fda810c79dc 100644 --- a/drivers/tee/amdtee/core.c +++ b/drivers/tee/amdtee/core.c @@ -444,11 +444,11 @@ static int __init amdtee_driver_init(void) goto err_fail; drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL); - if (IS_ERR(drv_data)) + if (!drv_data) return -ENOMEM; amdtee = kzalloc(sizeof(*amdtee), GFP_KERNEL); - if (IS_ERR(amdtee)) { + if (!amdtee) { rc = -ENOMEM; goto err_kfree_drv_data; } -- 2.24.0

6 years

[PATCH][next] tee: fix memory allocation failure checks on drv_data and amdtee

by Colin King

6 years

[PATCH 0/5] amdtee: Address bug report

by Rijo Thomas

This patch series addresses the bug report submitted by Dan Carpenter. Link: https://lists.linaro.org/pipermail/tee-dev/2020-January/001417.html Since, these patches are based on cryptodev-2.6 tree, I have included linux-crypto list as well. This patch series does not fix the static checker warning reported due to incorrect use of IS_ERR. Colin Ian King has submitted a fix for this issue. Link: https://lkml.org/lkml/2020/1/8/88 Rijo Thomas (5): tee: amdtee: remove unused variable initialization tee: amdtee: print error message if tee not present tee: amdtee: skip tee_device_unregister if tee_device_alloc fails tee: amdtee: rename err label to err_device_unregister tee: amdtee: remove redundant NULL check for pool drivers/tee/amdtee/call.c | 14 +++++++------- drivers/tee/amdtee/core.c | 32 +++++++++++++++++--------------- 2 files changed, 24 insertions(+), 22 deletions(-) -- 2.17.1

6 years

[bug report] tee: add AMD-TEE driver

by Dan Carpenter

Hello Rijo Thomas, The patch 757cc3e9ff1d: "tee: add AMD-TEE driver" from Dec 27, 2019, leads to the following static checker warning: drivers/tee/amdtee/core.c:447 amdtee_driver_init() warn: 'drv_data' isn't an ERR_PTR drivers/tee/amdtee/core.c 435 static int __init amdtee_driver_init(void) 436 { 437 struct amdtee *amdtee = NULL; ^^^^^^^^^^^^^ 438 struct tee_device *teedev; 439 struct tee_shm_pool *pool = ERR_PTR(-EINVAL); ^^^^^^^^^^^^^^^^^^^^^^^^ These look like they are left overs from one error label style error handling. We're trying to enable the warning about unused assignments so it would be good to get rid of these. 440 int rc; 441 442 rc = psp_check_tee_status(); 443 if (rc) 444 goto err_fail; ^^^^^^^^^^^^^ Ideally psp_check_tee_status() would print its own error warning and we could return directly here. 445 446 drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL); 447 if (IS_ERR(drv_data)) ^^^^^^^^^^^^^^^^ This should check for NULL instead of error pointer. 448 return -ENOMEM; 449 450 amdtee = kzalloc(sizeof(*amdtee), GFP_KERNEL); 451 if (IS_ERR(amdtee)) { ^^^^^^^^^^^^^^ Same. 452 rc = -ENOMEM; 453 goto err_kfree_drv_data; 454 } 455 456 pool = amdtee_config_shm(); 457 if (IS_ERR(pool)) { 458 pr_err("shared pool configuration error\n"); 459 rc = PTR_ERR(pool); 460 goto err_kfree_amdtee; 461 } 462 463 teedev = tee_device_alloc(&amdtee_desc, NULL, pool, amdtee); 464 if (IS_ERR(teedev)) { 465 rc = PTR_ERR(teedev); 466 goto err; Better to create a "err_free_pool" label. The tee_device_unregister() is a no-op on this path so that's fine, but it's easier to read if we have the err_free_pool label. 467 } 468 amdtee->teedev = teedev; 469 470 rc = tee_device_register(amdtee->teedev); 471 if (rc) 472 goto err; "goto err;" is very vague. We are unregistering a device which was never registered which feels wrong but actually works fine... 473 474 amdtee->pool = pool; 475 476 drv_data->amdtee = amdtee; 477 478 pr_info("amd-tee driver initialization successful\n"); 479 return 0; 480 481 err: 482 tee_device_unregister(amdtee->teedev); 483 if (pool) ^^^^^^^^^ Always true. 484 tee_shm_pool_free(pool); 485 486 err_kfree_amdtee: 487 kfree(amdtee); 488 489 err_kfree_drv_data: 490 kfree(drv_data); 491 drv_data = NULL; 492 493 err_fail: 494 pr_err("amd-tee driver initialization failed\n"); 495 return rc; 496 } regards, dan carpenter

6 years

[PATCH 0/4] TEE driver for AMD APUs

by Rijo Thomas

This patch series introduces Trusted Execution Environment (TEE) driver for AMD APU enabled systems. The TEE is a secure area of a processor which ensures that sensitive data is stored, processed and protected in an isolated and trusted environment. The AMD Secure Processor is a dedicated processor which provides TEE to enable HW platform security. It offers protection against software attacks generated in Rich Operating System (Rich OS) such as Linux running on x86. The AMD-TEE Trusted OS running on AMD Secure Processor allows loading and execution of security sensitive applications called Trusted Applications (TAs). An example of a TA would be a DRM (Digital Rights Management) TA written to enforce content protection. Linux already provides a tee subsystem, which is described in [1]. The tee subsystem provides a generic TEE ioctl interface which can be used by user space to talk to a TEE driver. AMD-TEE driver registers with tee subsystem and implements tee function callbacks in an AMD platform specific manner. The following TEE commands are recognized by AMD-TEE Trusted OS: 1. TEE_CMD_ID_LOAD_TA : Load Trusted Application (TA) binary into TEE environment 2. TEE_CMD_ID_UNLOAD_TA : Unload TA binary from TEE environment 3. TEE_CMD_ID_OPEN_SESSION : Open session with loaded TA 4. TEE_CMD_ID_CLOSE_SESSION : Close session with loaded TA 5. TEE_CMD_ID_INVOKE_CMD : Invoke a command with loaded TA 6. TEE_CMD_ID_MAP_SHARED_MEM : Map shared memory 7. TEE_CMD_ID_UNMAP_SHARED_MEM : Unmap shared memory Each command has its own payload format. The AMD-TEE driver creates a command buffer payload for submission to AMD-TEE Trusted OS. The driver uses the services of AMD Secure Processor driver to submit commands to the Trusted OS. Further details can be found in [1]. This patch series is based on cryptodev-2.6 tree with base commit c6d633a92749 (crypto: algapi - make unregistration functions return void). [1] https://www.kernel.org/doc/Documentation/tee.txt Rijo Thomas (4): tee: allow compilation of tee subsystem for AMD CPUs tee: add AMD-TEE driver tee: amdtee: check TEE status during driver initialization Documentation: tee: add AMD-TEE driver details Documentation/tee.txt | 81 ++++++ drivers/crypto/ccp/tee-dev.c | 11 + drivers/tee/Kconfig | 4 +- drivers/tee/Makefile | 1 + drivers/tee/amdtee/Kconfig | 8 + drivers/tee/amdtee/Makefile | 5 + drivers/tee/amdtee/amdtee_if.h | 183 +++++++++++++ drivers/tee/amdtee/amdtee_private.h | 159 +++++++++++ drivers/tee/amdtee/call.c | 373 ++++++++++++++++++++++++++ drivers/tee/amdtee/core.c | 516 ++++++++++++++++++++++++++++++++++++ drivers/tee/amdtee/shm_pool.c | 93 +++++++ include/linux/psp-tee.h | 18 ++ include/uapi/linux/tee.h | 1 + 13 files changed, 1451 insertions(+), 2 deletions(-) create mode 100644 drivers/tee/amdtee/Kconfig create mode 100644 drivers/tee/amdtee/Makefile create mode 100644 drivers/tee/amdtee/amdtee_if.h create mode 100644 drivers/tee/amdtee/amdtee_private.h create mode 100644 drivers/tee/amdtee/call.c create mode 100644 drivers/tee/amdtee/core.c create mode 100644 drivers/tee/amdtee/shm_pool.c -- 1.9.1

6 years, 1 month

[GIT PULL] optee driver fix for v5.5

by Jens Wiklander

Hello arm-soc maintainers, Please pull this OP-TEE driver fix for kernel allocated dynamic shared memory. Thanks, Jens The following changes since commit d1eef1c619749b2a57e514a3fa67d9a516ffa919: Linux 5.5-rc2 (2019-12-15 15:16:08 -0800) are available in the Git repository at: git://git.linaro.org:/people/jens.wiklander/linux-tee.git tags/tee-optee-fix-for-5.5 for you to fetch changes up to 5a769f6ff439cedc547395a6dc78faa26108f741: optee: Fix multi page dynamic shm pool alloc (2020-01-03 11:21:12 +0100) ---------------------------------------------------------------- Fix OP-TEE multi page dynamic shm pool alloc ---------------------------------------------------------------- Sumit Garg (1): optee: Fix multi page dynamic shm pool alloc drivers/tee/optee/shm_pool.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)

6 years, 1 month

[GIT PULL] optee platform driver for v5.6

by Jens Wiklander

Hello arm-soc maintainers, Please pull this OP-TEE driver update where the driver is modeled as a platform driver instead. Thanks, Jens The following changes since commit d1eef1c619749b2a57e514a3fa67d9a516ffa919: Linux 5.5-rc2 (2019-12-15 15:16:08 -0800) are available in the Git repository at: git://git.linaro.org:/people/jens.wiklander/linux-tee.git tags/tee-optee-pldrv-for-5.6 for you to fetch changes up to f349710e413ad29132373e170c87dd35f2b62069: optee: model OP-TEE as a platform device/driver (2020-01-03 09:26:40 +0100) ---------------------------------------------------------------- Model OP-TEE as a platform device/driver ---------------------------------------------------------------- Ard Biesheuvel (1): optee: model OP-TEE as a platform device/driver drivers/tee/optee/core.c | 153 ++++++++++++++++++++--------------------------- 1 file changed, 64 insertions(+), 89 deletions(-)

6 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
30
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Tee-dev