]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'net-hsr-fixes-for-prp-duplication-and-vlan-unwind'
authorJakub Kicinski <kuba@kernel.org>
Thu, 2 Apr 2026 15:23:55 +0000 (08:23 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 2 Apr 2026 15:23:55 +0000 (08:23 -0700)
Luka Gejak says:

====================
net: hsr: fixes for PRP duplication and VLAN unwind

This series addresses two logic bugs in the HSR/PRP implementation
identified during a protocol audit. These are targeted for the 'net'
tree as they fix potential memory corruption and state inconsistency.

The primary change resolves a race condition in the node merging path by
implementing address-based lock ordering. This ensures that concurrent
mutations of sequence blocks do not lead to state corruption or
deadlocks.

An additional fix corrects asymmetric VLAN error unwinding by
implementing a centralized unwind path on slave errors.
====================

Link: https://patch.msgid.link/20260401092243.52121-1-luka.gejak@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Trivial merge