commit 6f89225494405ed051f2185613c78d30c76b3f45
author Maulik Patel <maulik.patel@arm.com> Tue Mar 05 16:39:38 2024 +0000
committer Maulik Patel <maulik.patel@arm.com> Fri Apr 05 12:42:20 2024 +0100
tree 81fb7d1a3f713f548a20821e33acd79bd938335b
parent dc44649ecf24ed55894e2b205690a93e013cf684

DPE: Return correct error type

If a required argument is omitted, return DPE_INVALID_ARGUMENT
instead of DPE_INVALID_COMMAND.

Signed-off-by: Maulik Patel <maulik.patel@arm.com>
Change-Id: I1151192461c9ee87ddc95bae64dce67a351fd964

partitions/dice_protection_environment/dpe_cmd_decode.c

diff --git a/partitions/dice_protection_environment/dpe_cmd_decode.c b/partitions/dice_protection_environment/dpe_cmd_decode.c
index dca935b..9fb50bb 100644
--- a/partitions/dice_protection_environment/dpe_cmd_decode.c
+++ b/partitions/dice_protection_environment/dpe_cmd_decode.c
@@ -24,7 +24,7 @@
         /* Valid label found - optional argument present */                    \
         COUNT_ARGS(num_of_valid_arguments);                                    \
     } else if (qcbor_err != QCBOR_ERR_LABEL_NOT_FOUND) {                       \
-        return DPE_INVALID_COMMAND;                                            \
+        return DPE_INVALID_ARGUMENT;                                           \
     } else {                                                                   \
         /* We have NOT found the optional argument, do not update the count */ \
     }
@@ -65,7 +65,7 @@
 
     QCBORDecode_GetByteStringInMapN(decode_ctx, DICE_CODE_HASH, &out);
     if (out.len != sizeof(input->code_hash)) {
-        return DPE_INVALID_COMMAND;
+        return DPE_INVALID_ARGUMENT;
     }
     memcpy(input->code_hash, out.ptr, out.len);
 
@@ -78,12 +78,12 @@
     /* Check error state before interpreting config type */
     qcbor_err = QCBORDecode_GetError(decode_ctx);
     if (qcbor_err != QCBOR_SUCCESS) {
-        return DPE_INVALID_COMMAND;
+        return DPE_INVALID_ARGUMENT;
     }
 
     if (out_int < kDiceConfigTypeInline ||
         out_int > kDiceConfigTypeDescriptor) {
-        return DPE_INVALID_COMMAND;
+        return DPE_INVALID_ARGUMENT;
     }
     input->config_type = (DiceConfigType)out_int;
 
@@ -91,7 +91,7 @@
     if (input->config_type == kDiceConfigTypeInline) {
         QCBORDecode_GetByteStringInMapN(decode_ctx, DICE_CONFIG_VALUE, &out);
         if (out.len != sizeof(input->config_value)) {
-            return DPE_INVALID_COMMAND;
+            return DPE_INVALID_ARGUMENT;
         }
         memcpy(input->config_value, out.ptr, out.len);
 
@@ -110,7 +110,7 @@
 
     QCBORDecode_GetByteStringInMapN(decode_ctx, DICE_AUTHORITY_HASH, &out);
     if (out.len != sizeof(input->authority_hash)) {
-        return DPE_INVALID_COMMAND;
+        return DPE_INVALID_ARGUMENT;
     }
     memcpy(input->authority_hash, out.ptr, out.len);
 
@@ -121,13 +121,13 @@
 
     QCBORDecode_GetInt64InMapN(decode_ctx, DICE_MODE, &out_int);
     if (out_int < kDiceModeNotInitialized || out_int > kDiceModeMaintenance) {
-        return DPE_INVALID_COMMAND;
+        return DPE_INVALID_ARGUMENT;
     }
     input->mode = (DiceMode)out_int;
 
     QCBORDecode_GetByteStringInMapN(decode_ctx, DICE_HIDDEN, &out);
     if (out.len != sizeof(input->hidden)) {
-        return DPE_INVALID_COMMAND;
+        return DPE_INVALID_ARGUMENT;
     }
     memcpy(input->hidden, out.ptr, out.len);
 
@@ -136,7 +136,7 @@
 
     qcbor_err = QCBORDecode_GetError(decode_ctx);
     if (qcbor_err != QCBOR_SUCCESS) {
-        return DPE_INVALID_COMMAND;
+        return DPE_INVALID_ARGUMENT;
     }
 
     return DPE_NO_ERROR;
@@ -194,7 +194,7 @@
                                     &out);
     qcbor_err = QCBORDecode_GetError(decode_ctx);
     if ((qcbor_err != QCBOR_SUCCESS) || (out.len != sizeof(context_handle))) {
-        return DPE_INVALID_COMMAND;
+        return DPE_INVALID_ARGUMENT;
     }
     memcpy(&context_handle, out.ptr, out.len);
     COUNT_ARGS(num_of_valid_arguments);
@@ -342,7 +342,7 @@
                                     &out);
     qcbor_err = QCBORDecode_GetError(decode_ctx);
     if ((qcbor_err != QCBOR_SUCCESS) || (out.len != sizeof(context_handle))) {
-        return DPE_INVALID_COMMAND;
+        return DPE_INVALID_ARGUMENT;
     }
     memcpy(&context_handle, out.ptr, out.len);
     COUNT_ARGS(num_of_valid_arguments);
@@ -422,7 +422,7 @@
                                     &out);
     qcbor_err = QCBORDecode_GetError(decode_ctx);
     if ((qcbor_err != QCBOR_SUCCESS) || (out.len != sizeof(context_handle))) {
-        return DPE_INVALID_COMMAND;
+        return DPE_INVALID_ARGUMENT;
     }
     memcpy(&context_handle, out.ptr, out.len);
     COUNT_ARGS(num_of_valid_arguments);
@@ -541,7 +541,7 @@
                                     &out);
     qcbor_err = QCBORDecode_GetError(decode_ctx);
     if ((qcbor_err != QCBOR_SUCCESS) || (out.len != sizeof(context_handle))) {
-        return DPE_INVALID_COMMAND;
+        return DPE_INVALID_ARGUMENT;
     }
     memcpy(&context_handle, out.ptr, out.len);
     COUNT_ARGS(num_of_valid_arguments);