Unverified Commit 0a8c3104 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tee-shm-register-fix-for-v6.17' of... 

Merge tag 'tee-shm-register-fix-for-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into soc/drivers

TEE fix2 for v6.17

Fixing incorrect error handling for a call to iov_iter_extract_pages().

* tag 'tee-shm-register-fix-for-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee:
  tee: fix register_shm_helper()

Link: https://lore.kernel.org/r/20250924083404.GA3747732@rayden


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ff0bebab d5cf5b37

drivers/tee/tee_shm.c

+8 −0
Original line number Diff line number Diff line
@@ -465,6 +465,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;

	}



	/*