public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Junjie Cao <junjie.cao@intel.com>
To: miriam.rachel.korenblit@intel.com, johannes.berg@intel.com,
	linux-wireless@vger.kernel.org, richardcochran@gmail.com
Cc: horms@kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org, yedidya.ben.shimol@intel.com,
	avraham.stern@intel.com, daniel.gabay@intel.com,
	krishnanand.prabhu@intel.com, luciano.coelho@intel.com,
	gregory.greenman@intel.com, stable@vger.kernel.org,
	Junjie Cao <junjie.cao@intel.com>,
	Vadim Fedorenko <vadim.fedorenko@linux.dev>
Subject: [PATCH v2 2/2] wifi: iwlwifi: mld: fix race condition in PTP removal
Date: Thu, 12 Feb 2026 20:50:35 +0800	[thread overview]
Message-ID: <20260212125035.1345718-2-junjie.cao@intel.com> (raw)
In-Reply-To: <20260212125035.1345718-1-junjie.cao@intel.com>

iwl_mld_ptp_remove() calls cancel_delayed_work_sync() only after
ptp_clock_unregister() and clearing ptp_data state (ptp_clock,
last_gp2, wrap_counter).

This creates a race where the delayed work iwl_mld_ptp_work() can
execute between ptp_clock_unregister() and cancel_delayed_work_sync(),
observing partially cleared PTP state.

Move cancel_delayed_work_sync() before ptp_clock_unregister() to
ensure the delayed work is fully stopped before any PTP cleanup
begins.

Fixes: d1e879ec600f ("wifi: iwlwifi: add iwlmld sub-driver")
Cc: stable@vger.kernel.org
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Signed-off-by: Junjie Cao <junjie.cao@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mld/ptp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/ptp.c b/drivers/net/wireless/intel/iwlwifi/mld/ptp.c
index 231920425c06..b40182320801 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/ptp.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/ptp.c
@@ -319,10 +319,10 @@ void iwl_mld_ptp_remove(struct iwl_mld *mld)
 			       mld->ptp_data.ptp_clock_info.name,
 			       ptp_clock_index(mld->ptp_data.ptp_clock));
 
+		cancel_delayed_work_sync(&mld->ptp_data.dwork);
 		ptp_clock_unregister(mld->ptp_data.ptp_clock);
 		mld->ptp_data.ptp_clock = NULL;
 		mld->ptp_data.last_gp2 = 0;
 		mld->ptp_data.wrap_counter = 0;
-		cancel_delayed_work_sync(&mld->ptp_data.dwork);
 	}
 }
-- 
2.48.1


      reply	other threads:[~2026-02-12 12:51 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-15 16:15 [PATCH] wifi: iwlwifi: ptp: Fix potential race condition in PTP removal Junjie Cao
2026-01-19 17:29 ` Simon Horman
2026-01-19 21:32 ` Vadim Fedorenko
2026-02-09  8:32 ` Korenblit, Miriam Rachel
2026-02-12 10:24   ` Junjie Cao
2026-02-12 12:50   ` [PATCH v2 1/2] wifi: iwlwifi: mvm: fix " Junjie Cao
2026-02-12 12:50     ` Junjie Cao [this message]

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=20260212125035.1345718-2-junjie.cao@intel.com \
    --to=junjie.cao@intel.com \
    --cc=avraham.stern@intel.com \
    --cc=daniel.gabay@intel.com \
    --cc=gregory.greenman@intel.com \
    --cc=horms@kernel.org \
    --cc=johannes.berg@intel.com \
    --cc=krishnanand.prabhu@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=luciano.coelho@intel.com \
    --cc=miriam.rachel.korenblit@intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=richardcochran@gmail.com \
    --cc=stable@vger.kernel.org \
    --cc=vadim.fedorenko@linux.dev \
    --cc=yedidya.ben.shimol@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