| Message ID | 20240803182548.2932270-1-manojvishy@google.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | idpf: Acquire the lock before accessing the xn->salt | expand |
On 8/3/24 20:25, Manoj Vishwanathan wrote: > The transaction salt was being accessed > before acquiring the idpf_vc_xn_lock when idpf has to forward the > virtchnl reply nits: This text would fit into two lines (the column limit is 75). Missing dot at the very end. > > Signed-off-by: Manoj Vishwanathan <manojvishy@google.com> thank you!, code looks fine it would be great if you could add a Fixes: tag, and add iwl-net as the target tree > --- > 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 70986e12da28..30eec674d594 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 */
diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c index 70986e12da28..30eec674d594 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 */
The transaction salt was being accessed before acquiring the idpf_vc_xn_lock when idpf has to forward the virtchnl reply Signed-off-by: Manoj Vishwanathan <manojvishy@google.com> --- drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)