From 4b61d2bd346de12bb62668ae0dc2f332643067a3 Mon Sep 17 00:00:00 2001

From: Wojciech Ziemba <wojciech.ziemba@intel.com>

Date: Thu, 7 Apr 2022 17:54:47 +0100

Subject: [PATCH] crypto: qat - add check for invalid PFVF protocol version 0

Git-commit: 4b61d2bd346de12bb62668ae0dc2f332643067a3

Patch-mainline: v5.19-rc1

References: jsc#PED-1073

PFVF protocol version 0 is not a valid version, but PF drivers

currently would report any such version from VFs as compatible.

This patch adds an extra check for the invalid PFVF protocol

version 0.

Signed-off-by: Wojciech Ziemba <wojciech.ziemba@intel.com>

Signed-off-by: Marco Chiappero <marco.chiappero@intel.com>

Reviewed-by: Marco Chiappero <marco.chiappero@intel.com>

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: Torsten Duwe <duwe@suse.de>

---

 drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c | 4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c b/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c

index 588352de1ef0e..c059b98836aaa 100644

--- a/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c

+++ b/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c

@@ -242,7 +242,9 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u8 vf_nr,

 			"VersionRequest received from VF%d (vers %d) to PF (vers %d)\n",

 			vf_nr, vf_compat_ver, ADF_PFVF_COMPAT_THIS_VERSION);

-		if (vf_compat_ver <= ADF_PFVF_COMPAT_THIS_VERSION)

+		if (vf_compat_ver == 0)

+			compat = ADF_PF2VF_VF_INCOMPATIBLE;

+		else if (vf_compat_ver <= ADF_PFVF_COMPAT_THIS_VERSION)

 			compat = ADF_PF2VF_VF_COMPATIBLE;

 		else

 			compat = ADF_PF2VF_VF_COMPAT_UNKNOWN;

-- 

2.35.3