From: luka.gejak@linux.dev
To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com
Cc: netdev@vger.kernel.org, fmaurer@redhat.com, horms@kernel.org,
bigeasy@linutronix.de, m-karicheri2@ti.com, luka.gejak@linux.dev
Subject: [PATCH net v4 0/2] net: hsr: fixes for PRP duplication and VLAN unwind
Date: Wed, 1 Apr 2026 11:22:41 +0200 [thread overview]
Message-ID: <20260401092243.52121-1-luka.gejak@linux.dev> (raw)
From: Luka Gejak <luka.gejak@linux.dev>
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.
Changes in v4:
- Split from a 4-patch series into 'net' and 'net-next' as requested.
- Added Fixes: tags to both patches to facilitate stable backporting.
- No logic changes to these patches since v3.
History of pre-separation series (v1-v3):
Changes in v3:
- addressed Felix review feedback in the VLAN add unwind fix
- removed the superfluous empty line
Changes in v2:
- picked up Reviewed-by tags on patches 1, 3 and 4
- changes in patch 2 per advice of Felix Maurer
Luka Gejak (2):
net: hsr: serialize seq_blocks merge across nodes
net: hsr: fix VLAN add unwind on slave errors
net/hsr/hsr_device.c | 32 +++++++++++++++++---------------
net/hsr/hsr_framereg.c | 38 ++++++++++++++++++++++++++++++++++++--
2 files changed, 53 insertions(+), 17 deletions(-)
--
2.53.0
next reply other threads:[~2026-04-01 9:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-01 9:22 luka.gejak [this message]
2026-04-01 9:22 ` [PATCH net v4 1/2] net: hsr: serialize seq_blocks merge across nodes luka.gejak
2026-04-01 9:22 ` [PATCH net v4 2/2] net: hsr: fix VLAN add unwind on slave errors luka.gejak
2026-04-02 15:40 ` [PATCH net v4 0/2] net: hsr: fixes for PRP duplication and VLAN unwind patchwork-bot+netdevbpf
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=20260401092243.52121-1-luka.gejak@linux.dev \
--to=luka.gejak@linux.dev \
--cc=bigeasy@linutronix.de \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fmaurer@redhat.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=m-karicheri2@ti.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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