]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commit
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)
commitbe193568bef72c21dc7608ef7bf6232bcf091439
treedda28de72cca746390af06d431e91dd9b2c99239
parentb18c833888742ca9de80c250f9d40d0e97caa9f6
parent2e3514e63bfb0e972b1f19668547a455d0129e88
Merge branch 'net-hsr-fixes-for-prp-duplication-and-vlan-unwind'

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>