From: Jens Wiklander <jens.wiklander@linaro.org>
To: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
op-tee@lists.trustedfirmware.org, devicetree@vger.kernel.org,
linux-doc@vger.kernel.org
Cc: Jerome Forissier <jerome@forissier.org>,
Etienne Carriere <etienne.carriere@linaro.org>,
Sumit Garg <sumit.garg@linaro.org>,
Vincent Guittot <vincent.guittot@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
Ard Biesheuvel <ardb@kernel.org>, Marc Zyngier <maz@kernel.org>,
Jens Wiklander <jens.wiklander@linaro.org>
Subject: [PATCH v5 3/6] tee: fix put order in teedev_close_context()
Date: Thu, 26 Aug 2021 14:30:29 +0200 [thread overview]
Message-ID: <20210826123032.1732926-4-jens.wiklander@linaro.org> (raw)
In-Reply-To: <20210826123032.1732926-1-jens.wiklander@linaro.org>
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")
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
drivers/tee/tee_core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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)
--
2.31.1
next prev parent reply other threads:[~2021-08-26 12:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 12:30 [PATCH v5 0/6] Asynchronous notifications from secure world Jens Wiklander
2021-08-26 12:30 ` [PATCH v5 1/6] docs: staging/tee.rst: add a section on OP-TEE notifications Jens Wiklander
2021-08-26 12:30 ` [PATCH v5 2/6] dt-bindings: arm: optee: add interrupt property Jens Wiklander
2021-08-26 12:30 ` Jens Wiklander [this message]
2021-08-26 12:30 ` [PATCH v5 4/6] tee: add tee_dev_open_helper() primitive Jens Wiklander
2021-08-27 6:23 ` Sumit Garg
2021-08-27 9:26 ` Jens Wiklander
2021-08-26 12:30 ` [PATCH v5 5/6] optee: separate notification functions Jens Wiklander
2021-08-26 12:30 ` [PATCH v5 6/6] optee: add asynchronous notifications Jens Wiklander
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210826123032.1732926-4-jens.wiklander@linaro.org \
--to=jens.wiklander@linaro.org \
--cc=ardb@kernel.org \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=etienne.carriere@linaro.org \
--cc=jerome@forissier.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=op-tee@lists.trustedfirmware.org \
--cc=robh+dt@kernel.org \
--cc=sumit.garg@linaro.org \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).