diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2018-01-06 12:22:30 +0300 |
|---|---|---|
| committer | Jens Wiklander <jens.wiklander@linaro.org> | 2018-01-09 14:34:00 +0100 |
| commit | 2490cdf6435b1d3cac0dbf710cd752487c67c296 (patch) | |
| tree | afb63b0da6212dacd08ab4ec7b81922a99b9295e | |
| parent | c94f31b526fe658c25dd2d07c90486a85437f01c (diff) | |
| download | linux-stable-2490cdf6435b1d3cac0dbf710cd752487c67c296.tar.gz linux-stable-2490cdf6435b1d3cac0dbf710cd752487c67c296.tar.bz2 linux-stable-2490cdf6435b1d3cac0dbf710cd752487c67c296.zip | |
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: 033ddf12bcf5 ("tee: add register user memory")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
| -rw-r--r-- | drivers/tee/tee_shm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 6f36da9ee412..556960a1bab3 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -283,7 +283,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, if (rc > 0) shm->num_pages = rc; if (rc != num_pages) { - if (rc > 0) + if (rc >= 0) rc = -ENOMEM; ret = ERR_PTR(rc); goto err; |