Merge remote-tracking branch 'origin/imx_v2022.04' into lf_v2022.04

* origin/imx_v2022.04: MA-20507-7 trusty: fix dereference null return value

Merge remote-tracking branch 'origin/imx_v2022.04' into lf_v2022.04
* origin/imx_v2022.04: MA-20507-7 trusty: fix dereference null return value
BJ DevOps Team
2 parents 5bbb81e017 94c5bb2eb8
Showing 1 changed file Side-by-side Diff
lib/trusty/ql-tipc/keymaster.c
@@ -690,6 +690,11 @@
     int rc;
  
     req = trusty_calloc(4, 1); // 4 bytes should be enough.
+    if (!req) {
+        trusty_error("trusty_calloc memory failed!\n");
+        return -1;
+    }
+
     memcpy(req, &boot_patch_level, sizeof(uint32_t));
     req_size = sizeof(uint32_t);
...	...	@@ -690,6 +690,11 @@
690	690	int rc;
691	691
692	692	req = trusty_calloc(4, 1); // 4 bytes should be enough.
	693	+ if (!req) {
	694	+ trusty_error("trusty_calloc memory failed!\n");
	695	+ return -1;
	696	+ }
	697	+
693	698	memcpy(req, &boot_patch_level, sizeof(uint32_t));
694	699	req_size = sizeof(uint32_t);
695	700