public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: luka.gejak@linux.dev
To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
	pabeni@redhat.com, netdev@vger.kernel.org
Cc: horms@kernel.org, fmaurer@redhat.com, liuhangbin@gmail.com,
	bigeasy@linutronix.de, linux-kernel@vger.kernel.org,
	Luka Gejak <luka.gejak@linux.dev>
Subject: [PATCH net-next v1 3/4] net: hsr: require valid EOT supervision TLV
Date: Tue, 24 Mar 2026 15:35:02 +0100	[thread overview]
Message-ID: <20260324143503.187642-4-luka.gejak@linux.dev> (raw)
In-Reply-To: <20260324143503.187642-1-luka.gejak@linux.dev>

From: Luka Gejak <luka.gejak@linux.dev>

Supervision frames are only valid if terminated with a zero-length EOT
TLV. The current check fails to reject non-EOT entries as the terminal
TLV, potentially allowing malformed supervision traffic.

Fix this by strictly requiring the terminal TLV to be HSR_TLV_EOT
with a length of zero.

Signed-off-by: Luka Gejak <luka.gejak@linux.dev>
---
 net/hsr/hsr_forward.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c
index aefc9b6936ba..d26c7d0e8109 100644
--- a/net/hsr/hsr_forward.c
+++ b/net/hsr/hsr_forward.c
@@ -110,7 +110,7 @@ static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb)
 	}
 
 	/* end of tlvs must follow at the end */
-	if (hsr_sup_tlv->HSR_TLV_type == HSR_TLV_EOT &&
+	if (hsr_sup_tlv->HSR_TLV_type != HSR_TLV_EOT ||
 	    hsr_sup_tlv->HSR_TLV_length != 0)
 		return false;
 
-- 
2.53.0


  parent reply	other threads:[~2026-03-24 14:35 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-24 14:34 [PATCH net-next v1 0/4] net: hsr: address functional and concurrency bugs luka.gejak
2026-03-24 14:35 ` [PATCH net-next v1 1/4] net: hsr: serialize seq_blocks merge across nodes luka.gejak
2026-03-26 14:28   ` Felix Maurer
2026-03-24 14:35 ` [PATCH net-next v1 2/4] net: hsr: fix VLAN add unwind on slave errors luka.gejak
2026-03-26 14:29   ` Felix Maurer
2026-03-24 14:35 ` luka.gejak [this message]
2026-03-26 14:29   ` [PATCH net-next v1 3/4] net: hsr: require valid EOT supervision TLV Felix Maurer
2026-03-24 14:35 ` [PATCH net-next v1 4/4] net: hsr: reject unresolved interlink ifindex luka.gejak
2026-03-26 14:30   ` Felix Maurer

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=20260324143503.187642-4-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=linux-kernel@vger.kernel.org \
    --cc=liuhangbin@gmail.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