tee: shm: fix shm leak in register_shm_helper()
Subsystems (2)
PATCH 1/1 tee: shm: fix shm leak in register_shm_helper()
register_shm_helper() allocates shm before calling iov_iter_npages(). If iov_iter_npages() returns 0, the function jumps to err_ctx_put and leaks shm.
This can be triggered by TEE_IOC_SHM_REGISTER with struct tee_ioctl_shm_register_data where length is 0.
Jump to err_free_shm instead.
--- drivers/tee/tee_shm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tee/tee_shm.c +1 -1
@@ -435,7 +435,7 @@ register_shm_helper(struct tee_context *ctx, struct iov_iter *iter, u32 flags, num_pages =iov_iter_npages (iter,INT_MAX );if (!num_pages) { ret =ERR_PTR (-ENOMEM ); - goto err_ctx_put; + goto err_free_shm; } shm->pages =kzalloc_objs (*shm->pages, num_pages);
Signature · 1 line
2.50.1
Quoted 9 lines · Georgiy Osokin
register_shm_helper()allocates shm before callingiov_iter_npages(). Ifiov_iter_npages()returns 0, the function jumps toerr_ctx_putand leaks shm.This can be triggered by
TEE_IOC_SHM_REGISTERwith structtee_ioctl_shm_register_datawhere length is 0.Jump to
err_free_shminstead.
Quoted 7 lines
Fixes 7bdee4157591 ("tee: Use iov_iter to better support shared buffer registration")Signed-off-by Georgiy Osokin <[email protected]>--- drivers/tee/tee_shm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks for the fix, FWIW:
-Sumit
Quoted 17 lines
drivers/tee/tee_shm.c +1
-1@@ -435,7 +435,7 @@ register_shm_helper(struct tee_context *ctx, struct iov_iter *iter, u32 flags, num_pages =iov_iter_npages (iter,INT_MAX );if (!num_pages) { ret =ERR_PTR (-ENOMEM ); - goto err_ctx_put; + goto err_free_shm; } shm->pages =kzalloc_objs (*shm->pages, num_pages);Signature · 1 line
2.50.1
Hi,
Quoted 19 lines · Sumit Garg
Quoted 9 lines · Georgiy Osokin
register_shm_helper()allocates shm before callingiov_iter_npages(). Ifiov_iter_npages()returns 0, the function jumps toerr_ctx_putand leaks shm.This can be triggered by
TEE_IOC_SHM_REGISTERwith structtee_ioctl_shm_register_datawhere length is 0.Jump to
err_free_shminstead.Quoted 7 lines
Fixes 7bdee4157591 ("tee: Use iov_iter to better support shared buffer registration")Signed-off-by Georgiy Osokin <[email protected]>--- drivers/tee/tee_shm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 3 lines
Thanks for the fix, FWIW:
Reviewed-by Sumit Garg <[email protected]>
Looks good. I'm picking up this.
Cheers,
Jens