commit 012c20c7e3efdca7e4b5e3a8903ce5cef67296bf
author Mike McTernan <mikemcternan@google.com> Fri Feb 10 15:42:37 2023 +0000
committer Mike McTernan <mikemcternan@google.com> Fri Feb 10 15:42:37 2023 +0000
tree 9f622e6da4640c59dfc54357079f04db1c69e595
parent 5a0b95adf42a4a5d960cc95c708446db5eadffd8

trusty:user:base: Fix mmap() return checks for NULL.

Bug: 268626780
Test: manual; build.py qemu-generic-arm64-test-debug
Change-Id: I8152472de66af900fe736588d0291bcf6415beec

app/acvp/acvp.cpp

diff --git a/app/acvp/acvp.cpp b/app/acvp/acvp.cpp
index b3ff7f3..4fb6876 100644
--- a/app/acvp/acvp.cpp
+++ b/app/acvp/acvp.cpp
@@ -218,7 +218,7 @@
     shm_handle_ = shm;
     arg_buffer_ = (uint8_t*)mmap(NULL, arg_buffer_size_, PROT_READ | PROT_WRITE,
                                  0, shm_handle_, 0);
-    if (!arg_buffer_) {
+    if (arg_buffer_ == MAP_FAILED) {
         return false;
     }
 

lib/spi/srv/tipc/tipc.c

diff --git a/lib/spi/srv/tipc/tipc.c b/lib/spi/srv/tipc/tipc.c
index 7015191..a6f8f9f 100644
--- a/lib/spi/srv/tipc/tipc.c
+++ b/lib/spi/srv/tipc/tipc.c
@@ -125,7 +125,7 @@
 
     shm_base = mmap(0, shm_req->len, MMAP_FLAG_PROT_READ | MMAP_FLAG_PROT_WRITE,
                     0, shm_handle, 0);
-    if (!shm_base) {
+    if (shm_base == MAP_FAILED) {
         TLOGE("failed to map shared memory\n");
         rc = ERR_GENERIC;
         goto err_mmap;