From: Manoj Vishwanathan <manojvishy@google.com>
To: Tony Nguyen <anthony.l.nguyen@intel.com>,
Przemek Kitszel <przemyslaw.kitszel@intel.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org,
Manoj Vishwanathan <manojvishy@google.com>,
linux-kernel@vger.kernel.org,
google-lan-reviews@googlegroups.com
Subject: [Intel-wired-lan] [PATCH v1 2/5] idpf: Acquire the lock before accessing the xn->salt
Date: Tue, 13 Aug 2024 18:27:44 +0000 [thread overview]
Message-ID: <20240813182747.1770032-3-manojvishy@google.com> (raw)
In-Reply-To: <20240813182747.1770032-1-manojvishy@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 <manojvishy@google.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 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 */
--
2.46.0.76.ge559c4bf1a-goog
next prev parent reply other threads:[~2024-08-13 18:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-13 18:27 [Intel-wired-lan] [PATCH v1 0/5] IDPF Virtchnl fixes Manoj Vishwanathan
2024-08-13 18:27 ` [Intel-wired-lan] [PATCH v1 1/5] idpf: address an rtnl lock splat in tx timeout recovery path Manoj Vishwanathan
2024-08-13 18:27 ` Manoj Vishwanathan [this message]
2024-08-13 18:27 ` [Intel-wired-lan] [PATCH v1 3/5] idpf: convert workqueues to unbound Manoj Vishwanathan
2024-08-13 18:27 ` [Intel-wired-lan] [PATCH v1 4/5] idpf: more info during virtchnl transaction time out Manoj Vishwanathan
2024-08-13 19:28 ` Paul Menzel
2024-08-13 18:27 ` [Intel-wired-lan] [PATCH v1 5/5] idpf: warn on possible ctlq overflow Manoj Vishwanathan
2024-08-13 19:19 ` Willem de Bruijn
2024-08-15 22:55 ` [Intel-wired-lan] [PATCH v1 0/5] IDPF Virtchnl fixes Tony Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240813182747.1770032-3-manojvishy@google.com \
--to=manojvishy@google.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=google-lan-reviews@googlegroups.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=przemyslaw.kitszel@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox