summaryrefslogtreecommitdiffstats
path: root/drivers/tee
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-11-27 21:04:53 +0100
committerArnd Bergmann <arnd@arndb.de>2020-11-27 21:04:53 +0100
commit718e43b5f850a8fb52933ac5ecf29f5eef48a349 (patch)
tree7b300d58e0c4c654c62e9d9873097ad0a860367d /drivers/tee
parentMerge tag 'tegra-for-5.11-firmware' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentLinux 5.10-rc2 (diff)
downloadlinux-718e43b5f850a8fb52933ac5ecf29f5eef48a349.tar.xz
linux-718e43b5f850a8fb52933ac5ecf29f5eef48a349.zip
Backmerge tag 'v5.10-rc2' into arm/drivers
The SCMI pull request for the arm/drivers branch requires v5.10-rc2 because of dependencies with other git trees, so merge that in here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/tee')
-rw-r--r--drivers/tee/tee_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index f53bf336c0a2..6ade4a5c4840 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;