diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2020-11-06 17:32:55 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-06 17:33:38 -0800 |
| commit | ae0d0bb29b311ee3c71c8796f76d309a3779c8d9 (patch) | |
| tree | ae8e6f90d4eec5594bf42fe7aa9c3d989fc4317e /drivers/tee | |
| parent | Revert ibmvnic merge do_change_param_reset into do_reset (diff) | |
| parent | Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux (diff) | |
| download | linux-dev-ae0d0bb29b311ee3c71c8796f76d309a3779c8d9.tar.xz linux-dev-ae0d0bb29b311ee3c71c8796f76d309a3779c8d9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/tee')
| -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; |