OSDN Git Service

tee: shm: Potential NULL dereference calling tee_shm_register()
authorDan Carpenter <dan.carpenter@oracle.com>
Sat, 6 Jan 2018 09:22:30 +0000 (12:22 +0300)
committerJens Wiklander <jens.wiklander@linaro.org>
Tue, 9 Jan 2018 13:34:00 +0000 (14:34 +0100)
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>
drivers/tee/tee_shm.c

index 6f36da9..556960a 100644 (file)
@@ -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;