1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c
index 20ca9c9e109e..453d27d2a4ff 100644
--- a/drivers/crypto/ccp/ccp-ops.c
+++ b/drivers/crypto/ccp/ccp-ops.c
@@ -783,7 +783,7 @@ ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
                                     in_place ? DMA_BIDIRECTIONAL
                                              : DMA_TO_DEVICE);
                 if (ret)
-                        goto e_ctx;
+                        goto e_aad;
 
                 if (in_place) {
                         dst = src;
@@ -868,7 +868,7 @@ ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
         op.u.aes.size = 0;
         ret = cmd_q->ccp->vdata->perform->aes(&op);
         if (ret)
-                goto e_dst;
+                goto e_final_wa;
 
         if (aes->action == CCP_AES_ACTION_ENCRYPT) {
                 /* Put the ciphered tag after the ciphertext. */
@@ -878,17 +878,19 @@ ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
                 ret = ccp_init_dm_workarea(&tag, cmd_q, authsize,
                                            DMA_BIDIRECTIONAL);
                 if (ret)
-                        goto e_tag;
+                        goto e_final_wa;
                 ret = ccp_set_dm_area(&tag, 0, p_tag, 0, authsize);
-                if (ret)
-                        goto e_tag;
+                if (ret) {
+                        ccp_dm_free(&tag);
+                        goto e_final_wa;
+                }
 
                 ret = crypto_memneq(tag.address, final_wa.address,
                                     authsize) ? -EBADMSG : 0;
                 ccp_dm_free(&tag);
         }
 
-e_tag:
+e_final_wa:
         ccp_dm_free(&final_wa);
 
 e_dst: