Fix second potential NULL dereference

danielinux · danielinux · commit 1ebd6231a8f8 · 2026-01-27T21:48:51.000+01:00
diff --git a/zephyr/src/arm_tee_crypto_api.c b/zephyr/src/arm_tee_crypto_api.c
@@ -431,7 +431,6 @@ psa_status_t psa_cipher_update(psa_cipher_operation_t *operation,
 {
     struct arm_tee_crypto_pack_iovec iov = {
         .function_id = ARM_TEE_CRYPTO_CIPHER_UPDATE_SID,
-        .op_handle = (uint32_t)operation->opaque,
     };
     psa_invec in_vec[] = {
         {.base = &iov, .len = sizeof(struct arm_tee_crypto_pack_iovec)},
@@ -448,6 +447,7 @@ psa_status_t psa_cipher_update(psa_cipher_operation_t *operation,
         return PSA_ERROR_INVALID_ARGUMENT;
     }
 
+    iov.op_handle = (uint32_t)operation->opaque;
     status = API_DISPATCH(in_vec, out_vec);
     if (status == PSA_SUCCESS) {
         *output_length = out_vec[0].len;

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,6 @@ psa_status_t psa_cipher_update(psa_cipher_operation_t *operation,`
`431`	`431`	`{`
`432`	`432`	`struct arm_tee_crypto_pack_iovec iov = {`
`433`	`433`	`.function_id = ARM_TEE_CRYPTO_CIPHER_UPDATE_SID,`
`434`		`- .op_handle = (uint32_t)operation->opaque,`
`435`	`434`	`};`
`436`	`435`	`psa_invec in_vec[] = {`
`437`	`436`	`{.base = &iov, .len = sizeof(struct arm_tee_crypto_pack_iovec)},`
`@@ -448,6 +447,7 @@ psa_status_t psa_cipher_update(psa_cipher_operation_t *operation,`
`448`	`447`	`return PSA_ERROR_INVALID_ARGUMENT;`
`449`	`448`	`}`
`450`	`449`
	`450`	`+ iov.op_handle = (uint32_t)operation->opaque;`
`451`	`451`	`status = API_DISPATCH(in_vec, out_vec);`
`452`	`452`	`if (status == PSA_SUCCESS) {`
`453`	`453`	`*output_length = out_vec[0].len;`