From: Jens Wiklander <jens.wiklander@linaro.org>
Date: Tue, 15 Jun 2021 20:23:50 +0000 (+0200)
Subject: tee: fix put order in teedev_close_context()
X-Git-Tag: accepted/tizen/unified/20230118.172025~3581
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=815570353f6bcd1cedf0aec0a572f53deed88020;p=platform%2Fkernel%2Flinux-rpi.git

tee: fix put order in teedev_close_context()

[ Upstream commit f18397ab3ae23e8e43bba9986e66af6d4497f2ad ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index 2b37bc4..85102d1 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)