From 545b8eb33e5ba0aa286278560a288353a18b9e5b Mon Sep 17 00:00:00 2001 From: Ruari Phipps Date: Tue, 28 Jul 2020 10:33:35 +0100 Subject: [PATCH] SPMD: Dont forward PARTITION_INFO_GET from secure FF-A instance Signed-off-by: Ruari Phipps Change-Id: I4e9fbfcfda4ed4b87d5ece1c609c57c73d617d4c --- services/std_svc/spmd/spmd_main.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/services/std_svc/spmd/spmd_main.c b/services/std_svc/spmd/spmd_main.c index 6ed2098c1..6f0d9b1dc 100644 --- a/services/std_svc/spmd/spmd_main.c +++ b/services/std_svc/spmd/spmd_main.c @@ -560,16 +560,22 @@ uint64_t spmd_smc_handler(uint32_t smc_fid, case FFA_RXTX_MAP_SMC32: case FFA_RXTX_MAP_SMC64: case FFA_RXTX_UNMAP: + case FFA_PARTITION_INFO_GET: + /* + * Should not be allowed to forward FFA_PARTITION_INFO_GET + * from Secure world to Normal world + * + * Fall through to forward the call to the other world + */ case FFA_MSG_RUN: /* This interface must be invoked only by the Normal world */ + if (secure_origin) { return spmd_ffa_error_return(handle, - FFA_ERROR_NOT_SUPPORTED); + FFA_ERROR_NOT_SUPPORTED); } /* Fall through to forward the call to the other world */ - - case FFA_PARTITION_INFO_GET: case FFA_MSG_SEND: case FFA_MSG_SEND_DIRECT_REQ_SMC64: case FFA_MSG_SEND_DIRECT_RESP_SMC64: