[Intel-wired-lan] [iwl-next PATCH v3 1/3] idpf: Acquire the lock before accessing the xn->salt

[Brian Vazquez]

From: Manoj Vishwanathan <manojvi...@google.com>

The transaction salt was being accessed before acquiring the
idpf_vc_xn_lock when idpf has to forward the virtchnl reply.

Fixes: 34c21fa894a1 ("idpf: implement virtchnl transaction manager")
Signed-off-by: Manoj Vishwanathan <manojvi...@google.com>
Signed-off-by: David Decotigny <de...@google.com>
Signed-off-by: Brian Vazquez <bria...@google.com>
Reviewed-by: Jacob Keller <jacob.e.kel...@intel.com>
Reviewed-by: Pavan Kumar Linga <pavan.kumar.li...@intel.com>
---
 drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c 
b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
index d46c95f91b0d..13274544f7f4 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
@@ -612,14 +612,15 @@ idpf_vc_xn_forward_reply(struct idpf_adapter *adapter,
                return -EINVAL;
        }
        xn = &adapter->vcxn_mngr->ring[xn_idx];
+       idpf_vc_xn_lock(xn);
        salt = FIELD_GET(IDPF_VC_XN_SALT_M, msg_info);
        if (xn->salt != salt) {
                dev_err_ratelimited(&adapter->pdev->dev, "Transaction salt does 
not match (%02x != %02x)\n",
                                    xn->salt, salt);
+               idpf_vc_xn_unlock(xn);
                return -EINVAL;
        }
 
-       idpf_vc_xn_lock(xn);
        switch (xn->state) {
        case IDPF_VC_XN_WAITING:
                /* success */
-- 
2.47.1.613.gc27f4b7a9f-goog