]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'drop_monitor-take-care-of-32bit-kernels'
authorJakub Kicinski <kuba@kernel.org>
Thu, 23 Jul 2026 18:00:03 +0000 (11:00 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 23 Jul 2026 18:00:03 +0000 (11:00 -0700)
Eric Dumazet says:

====================
drop_monitor: take care of 32bit kernels

This series fixes two drop_monitor issues on 32-bit architectures:

- Patch 1 uses nla_total_size_64bit() for PC and TIMESTAMP attributes to
  account for alignment padding added by nla_put_u64_64bit(), avoiding
  potential skb_over_panic() crashes.

- Patch 2 moves u64_stats updates before spin_unlock_irqrestore(), ensuring
  local interrupts are disabled to prevent seqcount corruption from nested
  interrupts in probe context.
====================

Link: https://patch.msgid.link/20260722141743.3266924-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Trivial merge