diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-10-26 10:55:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-10-26 10:55:56 +0100 |
| commit | 9774dd68535571307f709f25f0723d77d671009a (patch) | |
| tree | e16d13c9ca10e5d65fa3ab2e48bfbe55cd105467 | |
| parent | 30bbbcda5be45dd2d8f060b4a39452061d72da38 (diff) | |
| parent | 722939528a37aa0cb22d441e2045c0cf53e78fb0 (diff) | |
| download | linux-9774dd68535571307f709f25f0723d77d671009a.tar.gz linux-9774dd68535571307f709f25f0723d77d671009a.tar.bz2 linux-9774dd68535571307f709f25f0723d77d671009a.zip | |
Merge tag 'tee-fix-for-v5.10' of git://git.linaro.org:/people/jens.wiklander/linux-tee into arm/fixes
Reenable kernel login method for kernel TEE client API
The kernel TEE login method was accidentally disabled previously when
enabling a few other login methods, so fix that here.
* tag 'tee-fix-for-v5.10' of git://git.linaro.org:/people/jens.wiklander/linux-tee:
tee: client UUID: Skip REE kernel login method as well
Link: https://lore.kernel.org/r/20201013070918.GA3328976@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/tee/tee_core.c | 3 |
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; |