summaryrefslogtreecommitdiff
path: root/drivers/tee/optee
diff options
context:
space:
mode:
authorMostafa Saleh <smostafa@google.com>2026-06-17 14:51:24 +0000
committerJens Wiklander <jenswi@kernel.org>2026-06-29 08:04:45 +0200
commit650c88738ae8976f46ba71b24dd8aa311adc6fde (patch)
tree078989097325ce78d124f9effeca08a0f8e95d6b /drivers/tee/optee
parentdc59e4fea9d83f03bad6bddf3fa2e52491777482 (diff)
optee: ffa: Add NULL check in optee_ffa_lend_protmem
Sashiko (locally) reports a possible null dereference under memory pressure due to the lack of validation of the allocated pointer. Fix that by adding the missing check. Fixes: 2b78d79cdf96 ("optee: FF-A: dynamic protected memory allocation") Signed-off-by: Mostafa Saleh <smostafa@google.com> Signed-off-by: Sebastian Ene <sebastianene@google.com> Reviewed-by: Sumit Garg <sumit.garg@oss.qualcomm.com> Reviewed-by: Sebastian Ene <sebastianene@google.com> Signed-off-by: Jens Wiklander <jenswi@kernel.org>
Diffstat (limited to 'drivers/tee/optee')
-rw-r--r--drivers/tee/optee/ffa_abi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
index b4372fa268d0..633715b98625 100644
--- a/drivers/tee/optee/ffa_abi.c
+++ b/drivers/tee/optee/ffa_abi.c
@@ -698,6 +698,9 @@ static int optee_ffa_lend_protmem(struct optee *optee, struct tee_shm *protmem,
int rc;
mem_attr = kzalloc_objs(*mem_attr, ma_count);
+ if (!mem_attr)
+ return -ENOMEM;
+
for (n = 0; n < ma_count; n++) {
mem_attr[n].receiver = mem_attrs[n] & U16_MAX;
mem_attr[n].attrs = mem_attrs[n] >> 16;