commit 385fda877ae55330bfe8d0dce02f8e1bb62f2b92
author Kevin Peng <kevin.peng@arm.com> Wed Aug 18 10:41:19 2021 +0800
committer Ken Liu <ken.liu@arm.com> Tue Aug 31 11:07:28 2021 +0200
tree fd8bb9b2c8da3231c7caa18d132562caa95a6b05
parent 3d262f41ad4b0dea7dfb76c19238c0f2d92a7c8d

SPM: Add client_id validation

This patch abstracts the getting client ID code and adds validation.

Change-Id: I8d4c60d0065e9e4250ee7ee48195f7a2acc88d91
Signed-off-by: Kevin Peng <kevin.peng@arm.com>

secure_fw/spm/ffm/psa_api.c

diff --git a/secure_fw/spm/ffm/psa_api.c b/secure_fw/spm/ffm/psa_api.c
index 6d5b746..ea6a098 100644
--- a/secure_fw/spm/ffm/psa_api.c
+++ b/secure_fw/spm/ffm/psa_api.c
@@ -18,7 +18,6 @@
 #include "psa_api.h"
 #include "utilities.h"
 #include "tfm_wait.h"
-#include "tfm_nspm.h"
 #include "ffm/spm_error_base.h"
 #include "tfm_rpc.h"
 #include "tfm_spm_hal.h"
@@ -109,11 +108,7 @@
         TFM_PROGRAMMER_ERROR(ns_caller, PSA_ERROR_CONNECTION_REFUSED);
     }
 
-    if (ns_caller) {
-        client_id = tfm_nspm_get_current_client_id();
-    } else {
-        client_id = tfm_spm_partition_get_running_partition_id();
-    }
+    client_id = tfm_spm_get_client_id(ns_caller);
 
     /*
      * Create connection handle here since it is possible to return the error
@@ -175,11 +170,7 @@
         TFM_PROGRAMMER_ERROR(ns_caller, PSA_ERROR_PROGRAMMER_ERROR);
     }
 
-    if (ns_caller) {
-        client_id = tfm_nspm_get_current_client_id();
-    } else {
-        client_id = tfm_spm_partition_get_running_partition_id();
-    }
+    client_id = tfm_spm_get_client_id(ns_caller);
 
     /* Allocate space from handle pool for static handle. */
     if (IS_STATIC_HANDLE(handle)) {
@@ -359,11 +350,7 @@
         TFM_PROGRAMMER_ERROR(ns_caller, PROGRAMMER_ERROR_NULL);
     }
 
-    if (ns_caller) {
-        client_id = tfm_nspm_get_current_client_id();
-    } else {
-        client_id = tfm_spm_partition_get_running_partition_id();
-    }
+    client_id = tfm_spm_get_client_id(ns_caller);
 
     conn_handle = tfm_spm_to_handle_instance(handle);
     /*