| From 4d7655f5b4c5d6846b795960c70e84e7a4d3aeb0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 17 Sep 2020 19:10:22 +0530 |
| Subject: tee: client UUID: Skip REE kernel login method as well |
| |
| From: Sumit Garg <sumit.garg@linaro.org> |
| |
| [ Upstream commit 722939528a37aa0cb22d441e2045c0cf53e78fb0 ] |
| |
| Since the addition of session's client UUID generation via commit [1], |
| login via REE kernel method was disallowed. So fix that via passing |
| nill UUID in case of TEE_IOCTL_LOGIN_REE_KERNEL method as well. |
| |
| Fixes: e33bcbab16d1 ("tee: add support for session's client UUID generation") [1] |
| Signed-off-by: Sumit Garg <sumit.garg@linaro.org> |
| Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/tee/tee_core.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c |
| index 64637e09a0953..2f6199ebf7698 100644 |
| --- a/drivers/tee/tee_core.c |
| +++ b/drivers/tee/tee_core.c |
| @@ -200,7 +200,8 @@ int tee_session_calc_client_uuid(uuid_t *uuid, u32 connection_method, |
| int name_len; |
| int rc; |
| |
| - if (connection_method == TEE_IOCTL_LOGIN_PUBLIC) { |
| + if (connection_method == TEE_IOCTL_LOGIN_PUBLIC || |
| + connection_method == TEE_IOCTL_LOGIN_REE_KERNEL) { |
| /* Nil UUID to be passed to TEE environment */ |
| uuid_copy(uuid, &uuid_null); |
| return 0; |
| -- |
| 2.27.0 |
| |
