From: Zhan Xusheng <zhanxusheng1024@gmail.com>
To: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Cc: Johannes Berg <johannes@sipsolutions.net>,
Daniel Gabay <daniel.gabay@intel.com>,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
Avraham Stern <avraham.stern@intel.com>,
Gregory Greenman <gregory.greenman@intel.com>,
Richard Cochran <richardcochran@gmail.com>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Zhan Xusheng <zhanxusheng@xiaomi.com>
Subject: [PATCH v2 0/2] wifi: iwlwifi: Fix GP2 to nanoseconds overflow on 32-bit
Date: Thu, 1 Oct 2026 13:01:01 +0800 [thread overview]
Message-ID: <20261001050103.860584-1-zhanxusheng@xiaomi.com> (raw)
GP2 timestamps are u32 microsecond values and NSEC_PER_USEC is 1000L, so
on 32-bit five conversions are computed in 32-bit arithmetic and truncated
before being assigned to u64. A GP2 value above U32_MAX / 1000, i.e.
4.295 s, wraps; GP2 wraps every 2^32 us, so almost its whole range is
affected.
The same files already cast four other conversions, so this is just the
remaining ones:
gp2_ns = iwl_mvm_ptp_get_adj_time(mvm, (u64)gp2 * NSEC_PER_USEC);
Changes since v1:
- Added the generated-code evidence below instead of "Found by code
inspection"
- Rebased on iwlwifi-next; no code change
- v1 was sent with the wrong From: address
On i386, iwl_mld_ptp_get_adj_time() changes from a 32-bit product to a
32x32->64 one:
before: imul $0x3e8,0x17d8(%eax),%ecx
after: mull 0x17d8(%ebx)
0x3e8 is NSEC_PER_USEC. A standalone _Static_assert() replica confirms the
arithmetic: with gp2 = 4294968 us, the current form gives 704 ns on 32-bit
instead of 4294968000.
mvm/ptp.c:219 already uses a u64 gp2 and is left alone. The
wrap_counter * IWL_PTP_GP2_WRAP * NSEC_PER_USEC products are fine because
IWL_PTP_GP2_WRAP is 0x100000000ULL.
Built for x86-64 and i386 with IWLMVM=m and IWLMLD=m; checkpatch --strict
is clean on both patches.
v1: https://patch.msgid.link/20260805082515.4136842-1-zhanxusheng@xiaomi.com
Zhan Xusheng (2):
wifi: iwlwifi: mvm: Fix GP2 to nanoseconds overflow on 32-bit
wifi: iwlwifi: mld: Fix GP2 to nanoseconds overflow on 32-bit
drivers/net/wireless/intel/iwlwifi/mld/ptp.c | 5 +++--
drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 4 ++--
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 +++-
3 files changed, 8 insertions(+), 5 deletions(-)
base-commit: 90e281bd4ea3d19dd6b5af1923551648e477bd26
--
2.43.0
next reply other threads:[~2026-10-01 5:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-01 5:01 Zhan Xusheng [this message]
2026-10-01 5:01 ` [PATCH v2 1/2] wifi: iwlwifi: mvm: Fix GP2 to nanoseconds overflow on 32-bit Zhan Xusheng
2026-10-05 5:15 ` netdev-bot+sashiko
2026-10-01 5:01 ` [PATCH v2 2/2] wifi: iwlwifi: mld: " Zhan Xusheng
2026-10-05 5:15 ` netdev-bot+sashiko
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=20261001050103.860584-1-zhanxusheng@xiaomi.com \
--to=zhanxusheng1024@gmail.com \
--cc=avraham.stern@intel.com \
--cc=daniel.gabay@intel.com \
--cc=emmanuel.grumbach@intel.com \
--cc=gregory.greenman@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=miriam.rachel.korenblit@intel.com \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=zhanxusheng@xiaomi.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