[dpdk-stable] [PATCH] crypto/qat: fix allocation check and leak

[Luca Boccassi]

On Thu, 2018-02-08 at 06:49 -0500, Yong Wang wrote:
> [ backported from upstream commit
> 963898f0e316611df9dc2964d059b4e16835b95a ]
> 
> There are several func calls to rte_zmalloc() which don't do null
> point check on the return value. Fix it by adding null point check.
> 
> Fixes: 1703e94ac5ce ("qat: add driver for QuickAssist devices")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Yong Wang <wang.yong19 at zte.com.cn>
> Acked-by: Fiona Trahe <fiona.trahe at intel.com>
> Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
> ---
>  drivers/crypto/qat/qat_adf/qat_algs_build_desc.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
> b/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
> index 1c4b184..ac9d822 100644
> --- a/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
> +++ b/drivers/crypto/qat/qat_adf/qat_algs_build_desc.c
> @@ -334,6 +334,11 @@ static int qat_alg_do_precomputes(enum
> icp_qat_hw_auth_algo hash_alg,
>  
>  		in = rte_zmalloc("working mem for key",
>  				ICP_QAT_HW_AES_XCBC_MAC_STATE2_SZ,
> 16);
> +		if (in == NULL) {
> +			PMD_DRV_LOG(ERR, "Failed to alloc memory");
> +			return -ENOMEM;
> +		}
> +
>  		rte_memcpy(in, qat_aes_xcbc_key_seed,
>  				ICP_QAT_HW_AES_XCBC_MAC_STATE2_SZ);
>  		for (x = 0; x < HASH_XCBC_PRECOMP_KEY_NUM; x++) {
> @@ -364,6 +369,11 @@ static int qat_alg_do_precomputes(enum
> icp_qat_hw_auth_algo hash_alg,
>  				ICP_QAT_HW_GALOIS_E_CTR0_SZ);
>  		in = rte_zmalloc("working mem for key",
>  				ICP_QAT_HW_GALOIS_H_SZ, 16);
> +		if (in == NULL) {
> +			PMD_DRV_LOG(ERR, "Failed to alloc memory");
> +			return -ENOMEM;
> +		}
> +
>  		memset(in, 0, ICP_QAT_HW_GALOIS_H_SZ);
>  		if (AES_set_encrypt_key(auth_key, auth_keylen << 3,
>  			&enc_key) != 0) {

Applied to dpdk-stable/16.11 (will be pushed soon), thanks.

-- 
Kind regards,
Luca Boccassi