tee: Fix tee_shm_register() for kernel TEE drivers
Subsystems (2)
PATCH 1/1 tee: Fix tee_shm_register() for kernel TEE drivers
Commit 056d3fed3d1f ("tee: add tee_shm_register_{user,kernel}_buf()") refactored tee_shm_register() into corresponding user and kernel space functions named tee_shm_register_{user,kernel}_buf(). The upstream fix commit 573ae4f13f63 ("tee: add overflow check in register_shm_helper()") only applied to tee_shm_register_user_buf().
But the stable kernel 4.19, 5.4, 5.10 and 5.15 don't have the above mentioned tee_shm_register() refactoring commit. Hence a direct backport wasn't possible and the fix has to be rather applied to tee_ioctl_shm_register().
Somehow the fix was correctly backported to 4.19 and 5.4 stable kernels but the backports for 5.10 and 5.15 stable kernels were broken as fix was applied to common tee_shm_register() function which broke its kernel space users such as trusted keys driver.
Fortunately the backport for 5.10 stable kernel was incidently fixed by:
commit 606fe84a4185 ("tee: fix memory leak in tee_shm_register()"). So fix the backport for 5.15 stable kernel as well.
--- drivers/tee/tee_core.c | 3 +++ drivers/tee/tee_shm.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/tee/tee_core.c +3 -0
@@ -334,6 +334,9 @@ tee_ioctl_shm_register(struct tee_context *ctx,if (data.flags)return -EINVAL ; +if (!access_ok ((void __user *)(unsigned long )data.addr, data.length)) +return -EFAULT ; + shm =tee_shm_register (ctx, data.addr, data.length,TEE_SHM_DMA_BUF |TEE_SHM_USER_MAPPED );if (IS_ERR (shm))
drivers/tee/tee_shm.c +0 -3
@@ -223,9 +223,6 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, goto err; } -if (!access_ok ((void __user *)addr, length)) -return ERR_PTR (-EFAULT ); -mutex_lock (&teedev->mutex); shm->id =idr_alloc (&teedev->idr, shm,1 ,0 ,GFP_KERNEL );mutex_unlock (&teedev->mutex);
Signature · 1 line
2.34.1
Greg KH
maintainerQuoted 20 lines · Sumit Garg
Commit
056d3fed3d1f("tee: add tee_shm_register_{user,kernel}_buf()") refactoredtee_shm_register()into corresponding user and kernel space functions named tee_shm_register_{user,kernel}_buf(). The upstream fix commit573ae4f13f63("tee: add overflow check inregister_shm_helper()") only applied totee_shm_register_user_buf().But the stable kernel 4.19, 5.4, 5.10 and 5.15 don't have the above mentioned
tee_shm_register()refactoring commit. Hence a direct backport wasn't possible and the fix has to be rather applied totee_ioctl_shm_register().Somehow the fix was correctly backported to 4.19 and 5.4 stable kernels but the backports for 5.10 and 5.15 stable kernels were broken as fix was applied to common
tee_shm_register()function which broke its kernel space users such as trusted keys driver.Fortunately the backport for 5.10 stable kernel was incidently fixed by:
commit606fe84a4185("tee: fix memory leak intee_shm_register()"). So fix the backport for 5.15 stable kernel as well.
Quoted 8 lines
Fixes 578c349570d2 ("tee: add overflow check in register_shm_helper()")Cc [email protected] # 5.15Reported-by Sahil Malhotra <[email protected]>Signed-off-by Sumit Garg <[email protected]>--- drivers/tee/tee_core.c | 3 +++ drivers/tee/tee_shm.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-)
Now queued up, thanks.
greg k-h