Skip to content

Commit

Permalink
crypto: qat - fix error path in adf_isr_resource_alloc()
Browse files Browse the repository at this point in the history
The function adf_isr_resource_alloc() is not unwinding correctly in case
of error.
This patch fixes the error paths and propagate the errors to the caller.

Fixes: 7afa232 ("crypto: qat - Intel(R) QAT DH895xcc accelerator")
Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Marco Chiappero <marco.chiappero@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
gcabiddu authored and herbertx committed Apr 2, 2021
1 parent 8d195e7 commit 83dc117
Showing 1 changed file with 21 additions and 8 deletions.
29 changes: 21 additions & 8 deletions drivers/crypto/qat/qat_common/adf_isr.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,19 +291,32 @@ int adf_isr_resource_alloc(struct adf_accel_dev *accel_dev)

ret = adf_isr_alloc_msix_entry_table(accel_dev);
if (ret)
return ret;
if (adf_enable_msix(accel_dev))
goto err_out;

if (adf_setup_bh(accel_dev))
goto err_out;
ret = adf_enable_msix(accel_dev);
if (ret)
goto err_free_msix_table;

if (adf_request_irqs(accel_dev))
goto err_out;
ret = adf_setup_bh(accel_dev);
if (ret)
goto err_disable_msix;

ret = adf_request_irqs(accel_dev);
if (ret)
goto err_cleanup_bh;

return 0;

err_cleanup_bh:
adf_cleanup_bh(accel_dev);

err_disable_msix:
adf_disable_msix(&accel_dev->accel_pci_dev);

err_free_msix_table:
adf_isr_free_msix_entry_table(accel_dev);

err_out:
adf_isr_resource_free(accel_dev);
return -EFAULT;
return ret;
}
EXPORT_SYMBOL_GPL(adf_isr_resource_alloc);

0 comments on commit 83dc117

Please sign in to comment.