linux-kernel - RE: [PATCH] tee: amdtee: fix an IS

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CH0PR12MB5346CA4DBE99A795A1B6CA48CF669@CH0PR12MB5346.namprd12.prod.outlook.com>
Date:   Mon, 29 Nov 2021 08:23:59 +0000
From:   "Thomas, Rijo-john" <Rijo-john.Thomas@....com>
To:     Dan Carpenter <dan.carpenter@...cle.com>,
        Jens Wiklander <jens.wiklander@...aro.org>
CC:     Sumit Garg <sumit.garg@...aro.org>,
        "Rangasamy, Devaraj" <Devaraj.Rangasamy@....com>,
        Herbert Xu <herbert@...dor.apana.org.au>,
        Gary R Hook <gary.hook@....com>,
        "op-tee@...ts.trustedfirmware.org" <op-tee@...ts.trustedfirmware.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "kernel-janitors@...r.kernel.org" <kernel-janitors@...r.kernel.org>
Subject: RE: [PATCH] tee: amdtee: fix an IS_ERR() vs NULL bug

[Public]

Acked-by: Rijo Thomas <Rijo-john.Thomas@....com>

-----Original Message-----
From: Dan Carpenter <dan.carpenter@...cle.com> 
Sent: Wednesday, November 24, 2021 8:24 PM
To: Jens Wiklander <jens.wiklander@...aro.org>; Thomas, Rijo-john <Rijo-john.Thomas@....com>
Cc: Sumit Garg <sumit.garg@...aro.org>; Rangasamy, Devaraj <Devaraj.Rangasamy@....com>; Herbert Xu <herbert@...dor.apana.org.au>; Gary R Hook <gary.hook@....com>; op-tee@...ts.trustedfirmware.org; linux-kernel@...r.kernel.org; kernel-janitors@...r.kernel.org
Subject: [PATCH] tee: amdtee: fix an IS_ERR() vs NULL bug

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@...cle.com>
---
 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 da6b88e80dc0..297dc62bca29 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.20.1