Tee-dev May 2018

tee-dev@lists.linaro.org

3 participants
2 discussions

[PATCH] tee: shm: fix use-after-free via temporarily dropped reference

by Jens Wiklander

From: Jann Horn <jannh(a)google.com> Bump the file's refcount before moving the reference into the fd table, not afterwards. The old code could drop the file's refcount to zero for a short moment before calling get_file() via get_dma_buf(). This code can only be triggered on ARM systems that use Linaro's OP-TEE. Fixes: 967c9cca2cc5 ("tee: generic TEE subsystem") Signed-off-by: Jann Horn <jannh(a)google.com> Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> --- drivers/tee/tee_shm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 556960a1bab3..07d3be6f0780 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -360,9 +360,10 @@ int tee_shm_get_fd(struct tee_shm *shm) if (!(shm->flags & TEE_SHM_DMA_BUF)) return -EINVAL; + get_dma_buf(shm->dmabuf); fd = dma_buf_fd(shm->dmabuf, O_CLOEXEC); - if (fd >= 0) - get_dma_buf(shm->dmabuf); + if (fd < 0) + dma_buf_put(shm->dmabuf); return fd; } -- 2.17.0

6 years, 6 months

[PATCH] core: arm: imx: add i.MX6Q Nitrogen6x support

by Amit Singh Tomar

This patch adds support for Nitogen6x based. It is based on NXP's popular i.MX6 ARM-Cortex A9 processor[1]. 1. Build command: make PLATFORM=imx-mx6qnitrogen6x 2. Pass xtest [1] https://boundarydevices.com/product/nitrogen6x-board-imx6-arm-cortex-a9-sbc/ Signed-off-by: Amit Singh Tomar <amittomer25(a)gmail.com> --- CHANGELOG.md | 1 + README.md | 1 + core/arch/arm/plat-imx/conf.mk | 2 +- core/arch/arm/plat-imx/platform_config.h | 8 +++++--- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77cd648..49371a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -700,6 +700,7 @@ platform.  * d02: extended * hikey: extended +* imx-mx6qnitrogen6x: standard * imx-mx6qsabrelite: standard * imx-mx6qsabresd: standard * rcar-h3: standard, pass except issues [#1092][issue1092] and [#1093][issue1093] diff --git a/README.md b/README.md index e3e9a87..8a81545 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ The **Maintained?** column shows: | [NXP ls1046ardb](http://www.nxp.com/products/microcontrollers-and-processors/pow… Yes | ![Actively Maintained](documentation/images/green.svg) | | [FSL i.MX6 Quad SABRE Lite Board](https://boundarydevices.com/product/sabre-lite-imx6-sbc/) |`PLATFORM=imx-mx6qsabrelite`| Yes | ![Not maintained](documentation/images/red.svg) v2.2.0 | | [FSL i.MX6 Quad SABRE SD Board](http://www.nxp.com/products/software-and-tools/hardware-development-… |`PLATFORM=imx-mx6qsabresd`| Yes | ![Not maintained](documentation/images/red.svg) v2.2.0 | +| [NXP/FSL i.MX6 Quad Nitrogen6x Board](https://boundarydevices.com/product/nitrogen6x-board-imx6-arm-cortex… |`PLATFORM=imx-mx6qnitrogen6x`| Yes | ![Actively maintained](documentation/images/green.svg) v3.1.0 | | [FSL i.MX6 UltraLite EVK Board](http://www.freescale.com/products/arm-processors/i.mx-applications-p… |`PLATFORM=imx-mx6ulevk`| Yes | ![Actively Maintained](documentation/images/green.svg) | | [NXP i.MX7Dual SabreSD Board](http://www.nxp.com/products/software-and-tools/hardware-development-… |`PLATFORM=imx-mx7dsabresd`| Yes | ![Actively Maintained](documentation/images/green.svg) | | [NXP i.MX7Solo WaRP7 Board](http://www.nxp.com/products/developer-resources/reference-designs/wa… |`PLATFORM=imx-mx7warp7`| Yes | ![Actively Maintained](documentation/images/green.svg) | diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk index 5c9f04d..88aec52 100644 --- a/core/arch/arm/plat-imx/conf.mk +++ b/core/arch/arm/plat-imx/conf.mk @@ -3,7 +3,7 @@ PLATFORM_FLAVOR ?= mx6ulevk # Get SoC associated with the PLATFORM_FLAVOR mx6ul-flavorlist = mx6ulevk mx6ull-flavorlist = mx6ullevk -mx6q-flavorlist = mx6qsabrelite mx6qsabresd +mx6q-flavorlist = mx6qsabrelite mx6qsabresd mx6qnitrogen6x mx6sx-flavorlist = mx6sxsabreauto mx6d-flavorlist = mx6dl-flavorlist = mx6dlsabresd diff --git a/core/arch/arm/plat-imx/platform_config.h b/core/arch/arm/plat-imx/platform_config.h index 30d9947..f089108 100644 --- a/core/arch/arm/plat-imx/platform_config.h +++ b/core/arch/arm/plat-imx/platform_config.h @@ -110,7 +110,8 @@ #include <imx-regs.h> /* Board specific console UART */ -#if defined(PLATFORM_FLAVOR_mx6qsabrelite) +#if defined(PLATFORM_FLAVOR_mx6qsabrelite) || \ + defined(PLATFORM_FLAVOR_mx6qnitrogen6x) #define CONSOLE_UART_BASE UART2_BASE #endif #if defined(PLATFORM_FLAVOR_mx6qsabresd) @@ -122,8 +123,9 @@ /* Board specific RAM size */ #if defined(PLATFORM_FLAVOR_mx6qsabrelite) || \ - defined(PLATFORM_FLAVOR_mx6qsabresd) || \ - defined(PLATFORM_FLAVOR_mx6dlsabresd) + defined(PLATFORM_FLAVOR_mx6qsabresd) || \ + defined(PLATFORM_FLAVOR_mx6dlsabresd) || \ + defined(PLATFORM_FLAVOR_mx6qnitrogen6x) #define DRAM0_SIZE 0x40000000 #endif -- 1.9.1

6 years, 6 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Tee-dev May 2018