summaryrefslogtreecommitdiffstats
path: root/drivers/tee
diff options
context:
space:
mode:
authorJens Wiklander <jens.wiklander@linaro.org>2021-06-15 22:23:50 +0200
committerJens Wiklander <jens.wiklander@linaro.org>2021-11-17 14:08:54 +0100
commitf18397ab3ae23e8e43bba9986e66af6d4497f2ad (patch)
treee005c1db617e400db802d6e3449b7768dbd4cc54 /drivers/tee
parentdt-bindings: arm: optee: add interrupt property (diff)
downloadlinux-f18397ab3ae23e8e43bba9986e66af6d4497f2ad.tar.xz
linux-f18397ab3ae23e8e43bba9986e66af6d4497f2ad.zip
tee: fix put order in teedev_close_context()
Prior to this patch was teedev_close_context() calling tee_device_put() before teedev_ctx_put() leading to teedev_ctx_release() accessing ctx->teedev just after the reference counter was decreased on the teedev. Fix this by calling teedev_ctx_put() before tee_device_put(). Fixes: 217e0250cccb ("tee: use reference counting for tee_context") Reviewed-by: Sumit Garg <sumit.garg@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'drivers/tee')
-rw-r--r--drivers/tee/tee_core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index 2b37bc408fc3..85102d12d716 100644
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -98,8 +98,10 @@ void teedev_ctx_put(struct tee_context *ctx)
static void teedev_close_context(struct tee_context *ctx)
{
- tee_device_put(ctx->teedev);
+ struct tee_device *teedev = ctx->teedev;
+
teedev_ctx_put(ctx);
+ tee_device_put(teedev);
}
static int tee_open(struct inode *inode, struct file *filp)