Commit d5cf5b37 authored by Jens Wiklander's avatar Jens Wiklander
Browse files

tee: fix register_shm_helper() 



In register_shm_helper(), fix incorrect error handling for a call to
iov_iter_extract_pages(). A case is missing for when
iov_iter_extract_pages() only got some pages and return a number larger
than 0, but not the requested amount.

This fixes a possible NULL pointer dereference following a bad input from
ioctl(TEE_IOC_SHM_REGISTER) where parts of the buffer isn't mapped.

Cc: stable@vger.kernel.org
Reported-by: default avatarMasami Ichikawa <masami256@gmail.com>
Closes: https://lore.kernel.org/op-tee/CACOXgS-Bo2W72Nj1_44c7bntyNYOavnTjJAvUbEiQfq=u9W+-g@mail.gmail.com/


Tested-by: default avatarMasami Ichikawa <masami256@gmail.com>
Fixes: 7bdee415 ("tee: Use iov_iter to better support shared buffer registration")
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent 8f5ae30d

drivers/tee/tee_shm.c

+8 −0
Original line number Diff line number Diff line
@@ -319,6 +319,14 @@ register_shm_helper(struct tee_context *ctx, struct iov_iter *iter, u32 flags, 
	if (unlikely(len <= 0)) {

		ret = len ? ERR_PTR(len) : ERR_PTR(-ENOMEM);

		goto err_free_shm_pages;

	} else if (DIV_ROUND_UP(len + off, PAGE_SIZE) != num_pages) {

		/*

		 * If we only got a few pages, update to release the

		 * correct amount below.

		 */

		shm->num_pages = len / PAGE_SIZE;

		ret = ERR_PTR(-ENOMEM);

		goto err_put_shm_pages;

	}



	/*