提交 c94f31b5 编写于 作者: C Colin Ian King 提交者: Jens Wiklander

tee: shm: don't put_page on null shm->pages

In the case that shm->pages fails to allocate, the current exit
error path will try to put_page on a null shm->pages and cause
a null pointer dereference when accessing shm->pages[n]. Fix this
by only performing the put_page and kfree on shm->pages if it
is not null.

Detected by CoverityScan, CID#1463283 ("Dereference after null check")

Fixes: 033ddf12 ("tee: add register user memory")
Signed-off-by: NColin Ian King <colin.king@canonical.com>
Signed-off-by: NJens Wiklander <jens.wiklander@linaro.org>
上级 80ec6f5d
...@@ -335,9 +335,11 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, ...@@ -335,9 +335,11 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
idr_remove(&teedev->idr, shm->id); idr_remove(&teedev->idr, shm->id);
mutex_unlock(&teedev->mutex); mutex_unlock(&teedev->mutex);
} }
for (n = 0; n < shm->num_pages; n++) if (shm->pages) {
put_page(shm->pages[n]); for (n = 0; n < shm->num_pages; n++)
kfree(shm->pages); put_page(shm->pages[n]);
kfree(shm->pages);
}
} }
kfree(shm); kfree(shm);
teedev_ctx_put(ctx); teedev_ctx_put(ctx);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册