Skip to content

Commit c6b199d

Browse files
Patch kubernetes for CVE-2025-52881
1 parent 67c0c70 commit c6b199d

File tree

2 files changed

+68
-1
lines changed

2 files changed

+68
-1
lines changed
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
From 3e5db3ebc8b7bdae53a85a582a73d78ab8a7c18f Mon Sep 17 00:00:00 2001
2+
From: AllSpark <[email protected]>
3+
Date: Mon, 24 Nov 2025 12:22:24 +0000
4+
Subject: [PATCH] vendor(runc): drop EnsureProcHandle checks; securejoin
5+
validation suffices. Align with upstream patch removing redundant procfs
6+
handle verifications in apparmor_linux.go and utils_unix.go.
7+
8+
Signed-off-by: Azure Linux Security Servicing Account <[email protected]>
9+
Upstream-reference: AI Backport of https://github.com/opencontainers/runc/commit/b3dd1bc562ed9996d1a0f249e056c16624046d28.diff
10+
---
11+
.../runc/libcontainer/apparmor/apparmor_linux.go | 3 ---
12+
.../runc/libcontainer/utils/utils_unix.go | 14 --------------
13+
2 files changed, 17 deletions(-)
14+
15+
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_linux.go
16+
index 8b1483c7..e187dc0d 100644
17+
--- a/vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_linux.go
18+
+++ b/vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor_linux.go
19+
@@ -40,9 +40,6 @@ func setProcAttr(attr, value string) error {
20+
}
21+
defer f.Close()
22+
23+
- if err := utils.EnsureProcHandle(f); err != nil {
24+
- return err
25+
- }
26+
27+
_, err = f.WriteString(value)
28+
return err
29+
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
30+
index bf3237a2..848da090 100644
31+
--- a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
32+
+++ b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
33+
@@ -12,17 +12,6 @@ import (
34+
"golang.org/x/sys/unix"
35+
)
36+
37+
-// EnsureProcHandle returns whether or not the given file handle is on procfs.
38+
-func EnsureProcHandle(fh *os.File) error {
39+
- var buf unix.Statfs_t
40+
- if err := unix.Fstatfs(int(fh.Fd()), &buf); err != nil {
41+
- return fmt.Errorf("ensure %s is on procfs: %w", fh.Name(), err)
42+
- }
43+
- if buf.Type != unix.PROC_SUPER_MAGIC {
44+
- return fmt.Errorf("%s is not on procfs", fh.Name())
45+
- }
46+
- return nil
47+
-}
48+
49+
type fdFunc func(fd int)
50+
51+
@@ -35,9 +24,6 @@ func fdRangeFrom(minFd int, fn fdFunc) error {
52+
}
53+
defer fdDir.Close()
54+
55+
- if err := EnsureProcHandle(fdDir); err != nil {
56+
- return err
57+
- }
58+
59+
fdList, err := fdDir.Readdirnames(-1)
60+
if err != nil {
61+
--
62+
2.45.4
63+

SPECS/kubernetes/kubernetes.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Microsoft Kubernetes
1111
Name: kubernetes
1212
Version: 1.30.10
13-
Release: 15%{?dist}
13+
Release: 16%{?dist}
1414
License: ASL 2.0
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -27,6 +27,7 @@ Patch5: CVE-2024-51744.patch
2727
Patch6: CVE-2025-30204.patch
2828
Patch7: CVE-2025-22872.patch
2929
Patch8: CVE-2025-4563.patch
30+
Patch9: CVE-2025-52881.patch
3031
BuildRequires: flex-devel
3132
BuildRequires: glibc-static >= 2.38-16%{?dist}
3233
BuildRequires: golang < 1.25
@@ -278,6 +279,9 @@ fi
278279
%{_exec_prefix}/local/bin/pause
279280

280281
%changelog
282+
* Mon Nov 24 2025 Azure Linux Security Servicing Account <[email protected]> - 1.30.10-16
283+
- Patch for CVE-2025-52881
284+
281285
* Mon Nov 10 2025 Andrew Phelps <[email protected]> - 1.30.10-15
282286
- Bump to rebuild with updated glibc
283287

0 commit comments

Comments
 (0)