From: Dan Carpenter <dan.carpenter@linaro.org>
Date: Thu, 5 Sep 2024 13:17:06 +0000 (+0300)
Subject: optee: Fix a NULL vs IS_ERR() check
X-Git-Tag: v6.12-rc1~158^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73048a832587520c6222bacbe1bc7121409d8861;p=thirdparty%2Fkernel%2Flinux.git

optee: Fix a NULL vs IS_ERR() check

The tee_shm_get_va() function never returns NULL, it returns error
pointers.  Update the check to match.

Fixes: f0c8431568ee ("optee: probe RPMB device using RPMB subsystem")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Link: https://lore.kernel.org/r/f8c12aed-b5d1-4522-bf95-622b8569706d@stanley.mountain
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c
index a4b49fd1d46d7..ebbbd42b0e3e7 100644
--- a/drivers/tee/optee/rpc.c
+++ b/drivers/tee/optee/rpc.c
@@ -332,7 +332,7 @@ static void handle_rpc_func_rpmb_probe_next(struct tee_context *ctx,
 	}
 	buf = tee_shm_get_va(params[1].u.memref.shm,
 			     params[1].u.memref.shm_offs);
-	if (!buf) {
+	if (IS_ERR(buf)) {
 		arg->ret = TEEC_ERROR_BAD_PARAMETERS;
 		return;
 	}