TF-M patch: Fix wrong check in tfm_spm_check_client_version (TF-M issue #236)

Michael Schwarcz · adbridge · commit 251b4c1d6bad · 2019-05-03T12:24:48.000+01:00
- Link to bug tracking: https://developer.trustedfirmware.org/T236 (cherry picked from commit 008bf1b)
diff --git a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/secure_fw/core/ipc/tfm_spm.c b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/secure_fw/core/ipc/tfm_spm.c
@@ -274,7 +274,7 @@ int32_t tfm_spm_check_client_version(struct tfm_spm_service_t *service,
 
     switch (service->service_db->minor_policy) {
     case TFM_VERSION_POLICY_RELAXED:
-        if (minor_version < service->service_db->minor_version) {
+        if (minor_version > service->service_db->minor_version) {
             return IPC_ERROR_VERSION;
         }
         break;

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ int32_t tfm_spm_check_client_version(struct tfm_spm_service_t *service,`
`274`	`274`
`275`	`275`	`switch (service->service_db->minor_policy) {`
`276`	`276`	`case TFM_VERSION_POLICY_RELAXED:`
`277`		`- if (minor_version < service->service_db->minor_version) {`
	`277`	`+ if (minor_version > service->service_db->minor_version) {`
`278`	`278`	`return IPC_ERROR_VERSION;`
`279`	`279`	`}`
`280`	`280`	`break;`