All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jens Wiklander <jens.wiklander@linaro.org>
To: stable@vger.kernel.org
Cc: Sumit Garg <sumit.garg@linaro.org>,
	Jerome Forissier <jerome.forissier@linaro.org>,
	Jens Wiklander <jens.wiklander@linaro.org>,
	Nimish Mishra <neelam.nimish@gmail.com>,
	Anirban Chakraborty <ch.anirban00727@gmail.com>,
	Debdeep Mukhopadhyay <debdeep.mukhopadhyay@gmail.com>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH] tee: add overflow check in tee_ioctl_shm_register()
Date: Mon, 22 Aug 2022 11:26:21 +0200	[thread overview]
Message-ID: <20220822092621.3691771-1-jens.wiklander@linaro.org> (raw)

commit 573ae4f13f630d6660008f1974c0a8a29c30e18a upstream.

With special lengths supplied by user space, tee_shm_register() has
an integer overflow when calculating the number of pages covered by a
supplied user space memory region.

This may cause pin_user_pages_fast() to do a NULL pointer dereference.

Fix this by adding an an explicit call to access_ok() in
tee_ioctl_shm_register() to catch an invalid user space address early.

Fixes: 033ddf12bcf5 ("tee: add register user memory")
Cc: stable@vger.kernel.org # 5.4
Reported-by: Nimish Mishra <neelam.nimish@gmail.com>
Reported-by: Anirban Chakraborty <ch.anirban00727@gmail.com>
Reported-by: Debdeep Mukhopadhyay <debdeep.mukhopadhyay@gmail.com>
Suggested-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[JW: backport to stable-5.4 + update commit message]
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
 drivers/tee/tee_core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index a7ccd4d2bd10..2db144d2d26f 100644
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -182,6 +182,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))
-- 
2.31.1


             reply	other threads:[~2022-08-22  9:26 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-22  9:26 Jens Wiklander [this message]
2022-08-22  9:59 ` [PATCH] tee: add overflow check in tee_ioctl_shm_register() Greg KH
2022-08-22 10:01   ` Greg KH
2022-08-22 12:07     ` Jens Wiklander
2022-08-22 13:12 Jens Wiklander
2022-08-22 13:32 ` Greg KH
2022-08-22 14:29   ` Jens Wiklander
2022-08-22 14:57     ` Greg KH
2022-08-23  7:00       ` Jens Wiklander
2022-08-23  7:14         ` Greg KH
2022-11-08  6:12 ` Sumit Garg
2022-11-08  6:23   ` Greg Kroah-Hartman
2022-08-22 15:02 Jens Wiklander
2022-08-22 15:13 ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220822092621.3691771-1-jens.wiklander@linaro.org \
    --to=jens.wiklander@linaro.org \
    --cc=ch.anirban00727@gmail.com \
    --cc=debdeep.mukhopadhyay@gmail.com \
    --cc=jerome.forissier@linaro.org \
    --cc=neelam.nimish@gmail.com \
    --cc=stable@vger.kernel.org \
    --cc=sumit.garg@linaro.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.