On Fri, Mar 12, 2021 at 11:22:03AM -0500, Tong Zhang wrote:
> ADF_STATUS_PF_RUNNING is (only) used and checked by adf_vf2pf_shutdown()
> before calling adf_iov_putmsg()->mutex_lock(vf2pf_lock), however the
> vf2pf_lock is initialized in adf_dev_init(), which can fail and when it
> fail, the vf2pf_lock is either not initialized or destroyed, a subsequent
> use of vf2pf_lock will cause issue.
> To fix this issue, only set this flag if adf_dev_init() returns 0.
>
> [ 7.178404] BUG: KASAN: user-memory-access in __mutex_lock.isra.0+0x1ac/0x7c0
> [ 7.180345] Call Trace:
> [ 7.182576] mutex_lock+0xc9/0xd0
> [ 7.183257] adf_iov_putmsg+0x118/0x1a0 [intel_qat]
> [ 7.183541] adf_vf2pf_shutdown+0x4d/0x7b [intel_qat]
> [ 7.183834] adf_dev_shutdown+0x172/0x2b0 [intel_qat]
> [ 7.184127] adf_probe+0x5e9/0x600 [qat_dh895xccvf]
>
> Signed-off-by: Tong Zhang <ztong0001@xxxxxxxxx>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Fixes: 25c6ffb249f6 ("crypto: qat - check if PF is running")
Acked-by: Giovanni Cabiddu <giovanni.cabiddu@xxxxxxxxx>
> ---
> drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 4 ++--
> drivers/crypto/qat/qat_c62xvf/adf_drv.c | 4 ++--
> drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
> index 1d1532e8fb6d..067ca5e17d38 100644
> --- a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
> +++ b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
> @@ -184,12 +184,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (ret)
> goto out_err_free_reg;
>
> - set_bit(ADF_STATUS_PF_RUNNING, &accel_dev->status);
> -
> ret = adf_dev_init(accel_dev);
> if (ret)
> goto out_err_dev_shutdown;
>
> + set_bit(ADF_STATUS_PF_RUNNING, &accel_dev->status);
> +
> ret = adf_dev_start(accel_dev);
> if (ret)
> goto out_err_dev_stop;
> diff --git a/drivers/crypto/qat/qat_c62xvf/adf_drv.c b/drivers/crypto/qat/qat_c62xvf/adf_drv.c
> index 04742a6d91ca..51ea88c0b17d 100644
> --- a/drivers/crypto/qat/qat_c62xvf/adf_drv.c
> +++ b/drivers/crypto/qat/qat_c62xvf/adf_drv.c
> @@ -184,12 +184,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (ret)
> goto out_err_free_reg;
>
> - set_bit(ADF_STATUS_PF_RUNNING, &accel_dev->status);
> -
> ret = adf_dev_init(accel_dev);
> if (ret)
> goto out_err_dev_shutdown;
>
> + set_bit(ADF_STATUS_PF_RUNNING, &accel_dev->status);
> +
> ret = adf_dev_start(accel_dev);
> if (ret)
> goto out_err_dev_stop;
> diff --git a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
> index c972554a755e..29999da716cc 100644
> --- a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
> +++ b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
> @@ -184,12 +184,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (ret)
> goto out_err_free_reg;
>
> - set_bit(ADF_STATUS_PF_RUNNING, &accel_dev->status);
> -
> ret = adf_dev_init(accel_dev);
> if (ret)
> goto out_err_dev_shutdown;
>
> + set_bit(ADF_STATUS_PF_RUNNING, &accel_dev->status);
> +
> ret = adf_dev_start(accel_dev);
> if (ret)
> goto out_err_dev_stop;
> --
> 2.25.1
>
