Re: [PATCH] [PATCH iwl-net] idpf: Acquire the lock before accessing the xn->salt

Przemek Kitszel
2024-08-06T10:23:17Z

On 8/5/24 20:21, Manoj Vishwanathan wrote:
> The transaction salt was being accessed before acquiring the
> idpf_vc_xn_lock when idpf has to forward the virtchnl reply.
>
> Fixes: 34c21fa894a1a (“idpf: implement virtchnl transaction manager”)
> Signed-off-by: Manoj Vishwanathan <manojvishy@google.com>

Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>

Thank you!
(next time please add "v2" (and so on) to subsequent versions of the
patch/series; please also send as a standalone thread, instead of
in-reply-to v1; no need to repost this one for any of those though)

> ---
> 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 */