Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions SPECS/flannel/CVE-2026-73500.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
From e3210e9f43988400c61dc1be04f8acf889e5dc1d Mon Sep 17 00:00:00 2001
From: Benjamin Wang <benjamin.ahrtr@gmail.com>
Date: Tue, 21 Jul 2026 10:16:47 +0100
Subject: [PATCH] Set a tlsHandshakeTimeout for tlsListener

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
Signed-off-by: Azure Linux Security Servicing Account <azurelinux-security@microsoft.com>
Upstream-reference: https://github.com/etcd-io/etcd/commit/8e4dd0679a2c6b095d2a32a749fda2521c7809a3.patch
---
.../etcd/client/pkg/v3/transport/listener_tls.go | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/listener_tls.go b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/listener_tls.go
index 6f16009..7e009f1 100644
--- a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/listener_tls.go
+++ b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/listener_tls.go
@@ -23,6 +23,12 @@ import (
"net"
"strings"
"sync"
+ "time"
+)
+
+const (
+ // tlsHandshakeTimeout bounds how long a single TLS handshake may block.
+ tlsHandshakeTimeout = 10 * time.Second
)

// tlsListener overrides a TLS listener so it will reject client
@@ -143,6 +149,7 @@ func (l *tlsListener) acceptLoop() {
}()

tlsConn := conn.(*tls.Conn)
+ _ = tlsConn.SetDeadline(time.Now().Add(tlsHandshakeTimeout))
herr := tlsConn.Handshake()
pendingMu.Lock()
delete(pending, conn)
@@ -152,6 +159,7 @@ func (l *tlsListener) acceptLoop() {
l.handshakeFailure(tlsConn, herr)
return
}
+ _ = tlsConn.SetDeadline(time.Time{})
if err := l.check(ctx, tlsConn); err != nil {
l.handshakeFailure(tlsConn, err)
return
--
2.45.4

6 changes: 5 additions & 1 deletion SPECS/flannel/flannel.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Summary: Simple and easy way to configure a layer 3 network fabric designed for Kubernetes
Name: flannel
Version: 0.24.2
Release: 29%{?dist}
Release: 30%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand All @@ -20,6 +20,7 @@ Patch5: CVE-2025-65637.patch
Patch6: CVE-2026-32241.patch
Patch7: CVE-2026-39821.patch
Patch8: CVE-2026-56852.patch
Patch9: CVE-2026-73500.patch
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: glibc-static >= 2.38-20%{?dist}
Expand Down Expand Up @@ -56,6 +57,9 @@ install -p -m 755 -t %{buildroot}%{_bindir} ./dist/flanneld
%{_bindir}/flanneld

%changelog
* Fri Aug 14 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 0.24.2-30
- Patch for CVE-2026-73500

* Mon Jul 27 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 0.24.2-29
- Patch for CVE-2026-56852

Expand Down
Loading