Commit 2490cdf6 authored by Dan Carpenter's avatar Dan Carpenter Committed by Jens Wiklander

tee: shm: Potential NULL dereference calling tee_shm_register()

get_user_pages_fast() can return zero in certain error paths.  We should
handle that or else it means we accidentally return ERR_PTR(0) which is
NULL instead of an error pointer.  The callers are not expecting that
and will crash with a NULL dereference.

Fixes: 033ddf12 ("tee: add register user memory")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent c94f31b5
...@@ -283,7 +283,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, ...@@ -283,7 +283,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
if (rc > 0) if (rc > 0)
shm->num_pages = rc; shm->num_pages = rc;
if (rc != num_pages) { if (rc != num_pages) {
if (rc > 0) if (rc >= 0)
rc = -ENOMEM; rc = -ENOMEM;
ret = ERR_PTR(rc); ret = ERR_PTR(rc);
goto err; goto err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment