| From 34e7341d6fc4351d9d96ae81f1a6dc34fa60452f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 24 Nov 2021 17:54:04 +0300 |
| Subject: tee: amdtee: fix an IS_ERR() vs NULL bug |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit 9d7482771fac8d8e38e763263f2ca0ca12dd22c6 ] |
| |
| The __get_free_pages() function does not return error pointers it returns |
| NULL so fix this condition to avoid a NULL dereference. |
| |
| Fixes: 757cc3e9ff1d ("tee: add AMD-TEE driver") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Acked-by: Rijo Thomas <Rijo-john.Thomas@amd.com> |
| Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/tee/amdtee/core.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/tee/amdtee/core.c b/drivers/tee/amdtee/core.c |
| index da6b88e80dc07..297dc62bca298 100644 |
| --- a/drivers/tee/amdtee/core.c |
| +++ b/drivers/tee/amdtee/core.c |
| @@ -203,9 +203,8 @@ static int copy_ta_binary(struct tee_context *ctx, void *ptr, void **ta, |
| |
| *ta_size = roundup(fw->size, PAGE_SIZE); |
| *ta = (void *)__get_free_pages(GFP_KERNEL, get_order(*ta_size)); |
| - if (IS_ERR(*ta)) { |
| - pr_err("%s: get_free_pages failed 0x%llx\n", __func__, |
| - (u64)*ta); |
| + if (!*ta) { |
| + pr_err("%s: get_free_pages failed\n", __func__); |
| rc = -ENOMEM; |
| goto rel_fw; |
| } |
| -- |
| 2.33.0 |
| |
