Re: [PATCH] crypto: caam - fix printing on xts fallback allocation error path

[Iuliana Prodan]

On 11/1/2020 10:05 PM, Horia Geantă wrote:
> At the time xts fallback tfm allocation fails the device struct
> hasn't been enabled yet in the caam xts tfm's private context.
>
> Fix this by using the device struct from xts algorithm's private context
> or, when not available, by replacing dev_err with pr_err.
>
> Fixes: 9d9b14dbe077 ("crypto: caam/jr - add fallback for XTS with more than 8B IV")
> Fixes: 83e8aa912138 ("crypto: caam/qi - add fallback for XTS with more than 8B IV")
> Fixes: 36e2d7cfdcf1 ("crypto: caam/qi2 - add fallback for XTS with more than 8B IV")
> Signed-off-by: Horia Geantă <horia.geanta@xxxxxxx>
Reviewed-by: Iuliana Prodan <iuliana.prodan@xxxxxxx>

> ---
>   drivers/crypto/caam/caamalg.c     | 4 ++--
>   drivers/crypto/caam/caamalg_qi.c  | 4 ++--
>   drivers/crypto/caam/caamalg_qi2.c | 3 ++-
>   3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
> index cf5bd7666dfc..8697ae53b063 100644
> --- a/drivers/crypto/caam/caamalg.c
> +++ b/drivers/crypto/caam/caamalg.c
> @@ -3404,8 +3404,8 @@ static int caam_cra_init(struct crypto_skcipher *tfm)
>   		fallback = crypto_alloc_skcipher(tfm_name, 0,
>   						 CRYPTO_ALG_NEED_FALLBACK);
>   		if (IS_ERR(fallback)) {
> -			dev_err(ctx->jrdev, "Failed to allocate %s fallback: %ld\n",
> -				tfm_name, PTR_ERR(fallback));
> +			pr_err("Failed to allocate %s fallback: %ld\n",
> +			       tfm_name, PTR_ERR(fallback));
>   			return PTR_ERR(fallback);
>   		}
>   
> diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
> index 66f60d78bdc8..a24ae966df4a 100644
> --- a/drivers/crypto/caam/caamalg_qi.c
> +++ b/drivers/crypto/caam/caamalg_qi.c
> @@ -2502,8 +2502,8 @@ static int caam_cra_init(struct crypto_skcipher *tfm)
>   		fallback = crypto_alloc_skcipher(tfm_name, 0,
>   						 CRYPTO_ALG_NEED_FALLBACK);
>   		if (IS_ERR(fallback)) {
> -			dev_err(ctx->jrdev, "Failed to allocate %s fallback: %ld\n",
> -				tfm_name, PTR_ERR(fallback));
> +			pr_err("Failed to allocate %s fallback: %ld\n",
> +			       tfm_name, PTR_ERR(fallback));
>   			return PTR_ERR(fallback);
>   		}
>   
> diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
> index 98c1ff1744bb..a780e627838a 100644
> --- a/drivers/crypto/caam/caamalg_qi2.c
> +++ b/drivers/crypto/caam/caamalg_qi2.c
> @@ -1611,7 +1611,8 @@ static int caam_cra_init_skcipher(struct crypto_skcipher *tfm)
>   		fallback = crypto_alloc_skcipher(tfm_name, 0,
>   						 CRYPTO_ALG_NEED_FALLBACK);
>   		if (IS_ERR(fallback)) {
> -			dev_err(ctx->dev, "Failed to allocate %s fallback: %ld\n",
> +			dev_err(caam_alg->caam.dev,
> +				"Failed to allocate %s fallback: %ld\n",
>   				tfm_name, PTR_ERR(fallback));
>   			return PTR_ERR(fallback);
>   		}