From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Niels Dossche <dossche.niels@gmail.com>,
Martin Habets <habetsm.xilinx@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
ecree.xilinx@gmail.com, kuba@kernel.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 18/20] sfc: extend the locking on mcdi->seqno
Date: Wed, 9 Mar 2022 11:21:56 -0500 [thread overview]
Message-ID: <20220309162158.136467-18-sashal@kernel.org> (raw)
In-Reply-To: <20220309162158.136467-1-sashal@kernel.org>
From: Niels Dossche <dossche.niels@gmail.com>
[ Upstream commit f1fb205efb0ccca55626fd4ef38570dd16b44719 ]
seqno could be read as a stale value outside of the lock. The lock is
already acquired to protect the modification of seqno against a possible
race condition. Place the reading of this value also inside this locking
to protect it against a possible race condition.
Signed-off-by: Niels Dossche <dossche.niels@gmail.com>
Acked-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/sfc/mcdi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
index be6bfd6b7ec7..50baf62b2cbc 100644
--- a/drivers/net/ethernet/sfc/mcdi.c
+++ b/drivers/net/ethernet/sfc/mcdi.c
@@ -163,9 +163,9 @@ static void efx_mcdi_send_request(struct efx_nic *efx, unsigned cmd,
/* Serialise with efx_mcdi_ev_cpl() and efx_mcdi_ev_death() */
spin_lock_bh(&mcdi->iface_lock);
++mcdi->seqno;
+ seqno = mcdi->seqno & SEQ_MASK;
spin_unlock_bh(&mcdi->iface_lock);
- seqno = mcdi->seqno & SEQ_MASK;
xflags = 0;
if (mcdi->mode == MCDI_MODE_EVENTS)
xflags |= MCDI_HEADER_XFLAGS_EVREQ;
--
2.34.1
next prev parent reply other threads:[~2022-03-09 16:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 16:21 [PATCH AUTOSEL 5.10 01/20] xfrm: Check if_id in xfrm_migrate Sasha Levin
2022-03-09 16:21 ` [PATCH AUTOSEL 5.10 02/20] xfrm: Fix xfrm migrate issues when address family changes Sasha Levin
2022-03-09 16:21 ` [PATCH AUTOSEL 5.10 08/20] mac80211: refuse aggregations sessions before authorized Sasha Levin
2022-03-09 16:21 ` [PATCH AUTOSEL 5.10 11/20] can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready Sasha Levin
2022-03-09 16:21 ` [PATCH AUTOSEL 5.10 12/20] atm: firestream: check the return value of ioremap() in fs_init() Sasha Levin
2022-03-09 16:21 ` [PATCH AUTOSEL 5.10 14/20] iwlwifi: don't advertise TWT support Sasha Levin
2022-03-09 16:21 ` [PATCH AUTOSEL 5.10 16/20] nl80211: Update bss channel on channel switch for P2P_CLIENT Sasha Levin
2022-03-09 16:21 ` [PATCH AUTOSEL 5.10 17/20] tcp: make tcp_read_sock() more robust Sasha Levin
2022-03-09 16:21 ` Sasha Levin [this message]
2022-03-09 16:21 ` [PATCH AUTOSEL 5.10 19/20] bnx2: Fix an error message Sasha Levin
2022-03-17 11:23 ` Pavel Machek
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=20220309162158.136467-18-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=dossche.niels@gmail.com \
--cc=ecree.xilinx@gmail.com \
--cc=habetsm.xilinx@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).