Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
0772b19
[MEDIUM] Patch cri-tools for CVE-2025-22872 (#13869)
aninda-al Aug 5, 2025
af41c86
msft-golang: upgrade version 1.24.1 -> 1.24.5 (#14442)
mfrw Aug 6, 2025
61b7855
[MEDIUM] Patch glib for CVE-2025-4373 (#13978)
aninda-al Aug 7, 2025
e4614ca
[AutoPR- Security] Patch binutils for CVE-2025-7545, CVE-2025-7546 [M…
azurelinux-security Aug 7, 2025
62c117d
[AUTO-CHERRYPICK] [2.0] Replaced PyPi's `junit-xml` module with AZL's…
CBL-Mariner-Bot Aug 7, 2025
dc4aa38
[AutoPR- Security] Patch libtiff for CVE-2025-8534, CVE-2025-8177, CV…
azurelinux-security Aug 8, 2025
3179611
[AutoPR- Security] Patch iperf3 for CVE-2025-54350, CVE-2025-54349 [M…
azurelinux-security Aug 8, 2025
7424596
[AutoPR- Security] Patch iputils for CVE-2025-48964 [MEDIUM] (#14411)
azurelinux-security Aug 8, 2025
1b2fdf8
[AUTO-CHERRYPICK] [AutoPR- Security] Patch ceph for CVE-2024-48916 [H…
CBL-Mariner-Bot Aug 8, 2025
ed2830f
[MEDIUM] Patch apache-commons-lang3 for CVE-2025-48924 (#14316)
aninda-al Aug 11, 2025
c3ac246
[Medium] Patch ruby for CVE-2025-24294 (#14296)
BinduSri-6522866 Aug 11, 2025
8c1fac0
[Medium] Patch python-urllib3 for CVE-2025-50181 (#14115)
durgajagadeesh Aug 11, 2025
04f900e
[MEDIUM] Patch krb5 for CVE-2025-3576 (#14092)
archana25-ms Aug 11, 2025
c0cc872
[AutoPR- Security] Patch rubygem-thor for CVE-2025-54314 [LOW] (#14369)
azurelinux-security Aug 11, 2025
d4eaa5d
[AutoPR- Security] Patch fluent-bit for CVE-2025-54126 [MEDIUM] (#14446)
azurelinux-security Aug 11, 2025
517ce36
[AutoPR- Security] Patch dnf5 for CVE-2024-1930 [MEDIUM] (#14461)
azurelinux-security Aug 12, 2025
512173a
[AUTO-CHERRYPICK] [AutoPR- Security] Patch libsoup for CVE-2025-4948 …
CBL-Mariner-Bot Aug 12, 2025
31ef6cc
[AUTO-CHERRYPICK] [AutoPR- Security] Patch icu for CVE-2025-5222 [HIG…
CBL-Mariner-Bot Aug 13, 2025
6c66789
[AUTO-CHERRYPICK] Patch sqlite for CVE-2025-6965[HIGH], CVE-2025-7458…
CBL-Mariner-Bot Aug 13, 2025
23b07c4
[2.0] Change default AZ creds to AZ CLI creds. (#14478)
PawelWMS Aug 14, 2025
91f05f2
[AUTO-CHERRYPICK] Patch luajit for CVE-2024-25177[HIGH] - branch main…
CBL-Mariner-Bot Aug 18, 2025
f301784
[AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade postgresql to 14.19 for …
CBL-Mariner-Bot Aug 18, 2025
76c1706
[LOW] Patch nodejs18 for CVE-2025-5889 (#14065)
aninda-al Aug 22, 2025
5671f8f
[AutoPR- Security] Patch edk2 for CVE-2025-3770 [MEDIUM] (#14473)
azurelinux-security Aug 22, 2025
92920d5
[AutoPR- Security] Patch libsoup for CVE-2025-4969 [MEDIUM] (#14498)
azurelinux-security Aug 22, 2025
e0fca46
[2.0] Passed Azure config to toolkit build env. (#14527)
PawelWMS Aug 23, 2025
fd6d1ee
[AutoPR- Security] Patch libtiff for CVE-2025-9165, CVE-2025-8851 [ME…
azurelinux-security Aug 25, 2025
705d7b8
[AutoPR- Security] Patch nginx for CVE-2025-53859 [MEDIUM] (#14548)
azurelinux-security Aug 25, 2025
bcd8202
[AutoPR- Security] Patch libsndfile for CVE-2024-50612 [MEDIUM] (#14534)
azurelinux-security Aug 25, 2025
5b622c3
[AutoPR- Security] Patch jasper for CVE-2025-8837, CVE-2025-8836 [MED…
azurelinux-security Aug 25, 2025
6939a03
[AutoPR- Security] Patch nvidia-container-toolkit for CVE-2025-22872 …
azurelinux-security Aug 25, 2025
fe331f4
[Low] Patch apparmor for CVE-2023-53154 (#14011)
durgajagadeesh Aug 28, 2025
3ee6af5
[Medium] Patch kubevirt for CVE-2024-33394 (#14315)
BinduSri-6522866 Aug 28, 2025
d6b1af4
[AUTOUPGRADE-CORE] Upgrade ca-certificates Msft cert change (#14584)
CBL-Mariner-Bot Aug 29, 2025
ee3f843
[AUTOPATCHER-CORE] Upgrade vim to 9.1.1616 for CVE-2025-9390 (#14576)
CBL-Mariner-Bot Sep 1, 2025
187dc78
Merge branch 'main' into mbykhovtsev/aug-release
mbykhovtsev-ms Sep 2, 2025
e7e1a01
[2.0] Added 2 CAs to `ca-certificates-base`: 'Microsoft TLS RSA Root …
PawelWMS Sep 3, 2025
4dc8101
Prepare August 2025 Release (#14591)
CBL-Mariner-Bot Sep 3, 2025
4899b8f
Merge branch 'main' of https://github.com/microsoft/CBL-Mariner into …
mbykhovtsev-ms Sep 3, 2025
d143993
[AutoPR- Security] Patch hvloader for CVE-2025-3770 [MEDIUM] (#14489)
azurelinux-security Sep 4, 2025
e264c73
[AUTO-CHERRYPICK] [High] Patch golang & golang-1.18 for CVE-2025-4790…
CBL-Mariner-Bot Sep 4, 2025
2553e1a
Merge branch 'main' of https://github.com/microsoft/CBL-Mariner into …
mbykhovtsev-ms Sep 5, 2025
67ad2f8
[AUTOUPGRADE-CORE] Upgrade ca-certificates Msft cert change (#14631)
CBL-Mariner-Bot Sep 6, 2025
be6c44a
[MEDIUM] Patch glib for CVE-2024-34397 (#14223)
archana25-ms Sep 8, 2025
f0d3b57
[Low] Patch libarchive for CVE-2025-5914, CVE-2025-5915, CVE-2025-591…
SumitJenaHCL Sep 8, 2025
622076f
Merge branch 'main' of https://github.com/microsoft/CBL-Mariner into …
mbykhovtsev-ms Sep 8, 2025
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
2 changes: 0 additions & 2 deletions .pipelines/prchecks/PackageBuildPRCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ extends:
maxCPU: "${{ configuration.maxCPUs }}"
outputArtifactsFolder: $(ob_outputDirectory)
outputRPMsTarballName: $(outputRPMsTarballName)
pipArtifactFeeds: "mariner/Mariner-Pypi-Feed"
selfRepoName: self
testSuiteName: "[${{ configuration.name }}] Package test"

Expand Down Expand Up @@ -204,7 +203,6 @@ extends:
isUseCCache: true
maxCPU: "${{ configuration.maxCPUs }}"
outputArtifactsFolder: $(ob_outputDirectory)
pipArtifactFeeds: "mariner/Mariner-Pypi-Feed"
selfRepoName: self
srpmPackList: "$(testListFromToolchain)"
testRerunList: "$(testListFromToolchain)"
Expand Down
10 changes: 0 additions & 10 deletions .pipelines/templates/PackageBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,6 @@ parameters:
type: string
default: ""

- name: pipArtifactFeeds
type: string
default: ""

- name: publishLogs
type: boolean
default: true
Expand Down Expand Up @@ -154,12 +150,6 @@ steps:
parameters:
buildRepoRoot: ${{ parameters.buildRepoRoot }}

- ${{ if parameters.pipArtifactFeeds }}:
- task: PipAuthenticate@1
inputs:
artifactFeeds: "${{ parameters.pipArtifactFeeds }}"
displayName: "Authenticate to custom pip artifact feeds"

- ${{ if parameters.customToolchainTarballName }}:
- script: |
toolchain_archive="$(find "${{ parameters.inputArtifactsFolder }}" -name "${{ parameters.customToolchainTarballName }}" -print -quit)"
Expand Down
4 changes: 1 addition & 3 deletions .pipelines/templates/PackageTestResultsAnalysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ parameters:
default: "$(Agent.TempDirectory)"

steps:
# TODO: the "--index-url" argument must be removed once accessing internal ADO feeds from fork PR checks is supported.
- bash: pip3 install --user junit_xml==1.9 --index-url https://pypi.org/simple
retryCountOnTaskFailure: 3
- bash: sudo tdnf install -y python3-junit-xml
displayName: "Install Python dependencies"

- task: PythonScript@0
Expand Down
5 changes: 4 additions & 1 deletion SPECS-EXTENDED/buildah/buildah.spec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
Summary: A command line tool used for creating OCI Images
Name: buildah
Version: 1.18.0
Release: 25%{?dist}
Release: 26%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -123,6 +123,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
%{_datadir}/%{name}/test

%changelog
* Thu Sep 04 2025 Akhila Guruju <[email protected]> - 1.18.0-26
- Bump release to rebuild with golang

* Mon Sep 09 2024 CBL-Mariner Servicing Account <[email protected]> - 1.18.0-25
- Bump release to rebuild with go 1.22.7

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

Name: %{project}-%{repo}
Version: 1.1.1
Release: 16%{?dist}
Release: 17%{?dist}
Summary: Libraries for writing CNI plugin
License: ASL 2.0 and BSD and MIT
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -129,6 +129,9 @@ install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
%{_unitdir}/cni-dhcp.socket

%changelog
* Thu Sep 04 2025 Akhila Guruju <[email protected]> - 1.1.1-17
- Bump release to rebuild with golang

* Mon Sep 09 2024 CBL-Mariner Servicing Account <[email protected]> - 1.1.1-16
- Bump release to rebuild with go 1.22.7

Expand Down
5 changes: 4 additions & 1 deletion SPECS-EXTENDED/delve/delve.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Vendor: Microsoft Corporation
Distribution: Mariner
Name: delve
Version: 1.5.0
Release: 19%{?dist}
Release: 20%{?dist}
Summary: A debugger for the Go programming language

License: MIT
Expand Down Expand Up @@ -72,6 +72,9 @@ done


%changelog
* Thu Sep 04 2025 Akhila Guruju <[email protected]> - 1.5.0-20
- Bump release to rebuild with golang

* Mon Sep 09 2024 CBL-Mariner Servicing Account <[email protected]> - 1.5.0-19
- Bump release to rebuild with go 1.22.7

Expand Down
5 changes: 4 additions & 1 deletion SPECS-EXTENDED/nmi/nmi.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Summary: Node Managed Identity
Name: nmi
Version: 1.8.17
Release: 5%{?dist}
Release: 6%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -62,6 +62,9 @@ popd
%{_bindir}/%{name}

%changelog
* Thu Sep 04 2025 Akhila Guruju <[email protected]> - 1.8.17-6
- Bump release to rebuild with golang

* Mon Sep 09 2024 CBL-Mariner Servicing Account <[email protected]> - 1.8.17-5
- Bump release to rebuild with go 1.22.7

Expand Down
5 changes: 4 additions & 1 deletion SPECS-EXTENDED/podman/podman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

Name: podman
Version: 4.1.1
Release: 22%{?dist}
Release: 23%{?dist}
License: ASL 2.0 and BSD and ISC and MIT and MPLv2.0
Summary: Manage Pods, Containers and Container Images
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -387,6 +387,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/

# rhcontainerbot account currently managed by lsm5
%changelog
* Thu Sep 04 2025 Akhila Guruju <[email protected]> - 4.1.1-23
- Bump release to rebuild with golang

* Mon Sep 09 2024 CBL-Mariner Servicing Account <[email protected]> - 4.1.1-22
- Bump release to rebuild with go 1.22.7

Expand Down
5 changes: 4 additions & 1 deletion SPECS-EXTENDED/umoci/umoci.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Open Container Image manipulation tool
Name: umoci
Version: 0.4.7
Release: 17%{?dist}
Release: 18%{?dist}
License: Apache-2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -39,6 +39,9 @@ go test -mod=vendor
%{_bindir}/umoci

%changelog
* Thu Sep 04 2025 Akhila Guruju <[email protected]> - 0.4.7-18
- Bump release to rebuild with golang

* Mon Sep 09 2024 CBL-Mariner Servicing Account <[email protected]> - 0.4.7-17
- Bump release to rebuild with go 1.22.7

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/hvloader-signed/hvloader-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Summary: Signed HvLoader.efi for %{buildarch} systems
Name: hvloader-signed-%{buildarch}
Version: 1.0.1
Release: 13%{?dist}
Release: 14%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -69,6 +69,9 @@ popd
/boot/efi/HvLoader.efi

%changelog
* Tue Aug 12 2025 Azure Linux Security Servicing Account <[email protected]> - 1.0.1-14
- Bump release for consistency with hvloader spec.

* Tue May 13 2025 Archana Shettigar <[email protected]> - 1.0.1-13
- Bump release for consistency with hvloader spec.

Expand Down
5 changes: 4 additions & 1 deletion SPECS/KeysInUse-OpenSSL/KeysInUse-OpenSSL.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: The KeysInUse Engine for OpenSSL allows the logging of private key usage through OpenSSL
Name: KeysInUse-OpenSSL
Version: 0.3.4
Release: 7%{?dist}
Release: 8%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -74,6 +74,9 @@ if [ -x %{_bindir}/keysinuseutil ]; then
fi

%changelog
* Thu Sep 04 2025 Akhila Guruju <[email protected]> - 0.3.4-8
- Bump release to rebuild with golang

* Mon Sep 09 2024 CBL-Mariner Servicing Account <[email protected]> - 0.3.4-7
- Bump release to rebuild with go 1.22.7

Expand Down
100 changes: 100 additions & 0 deletions SPECS/apache-commons-lang3/CVE-2025-48924.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
From b424803abdb2bec818e4fbcb251ce031c22aca53 Mon Sep 17 00:00:00 2001
From: Gary Gregory <[email protected]>
Date: Sat, 21 Sep 2024 17:23:08 -0400
Subject: [PATCH] Rewrite ClassUtils.getClass() without recursion to avoid
StackOverflowError on very long inputs.

- This was found fuzz testing Apache Commons Text which relies on
ClassUtils.
- OssFuzz Issue 42522972:
apache-commons-text:StringSubstitutorInterpolatorFuzzer: Security
exception in org.apache.commons.lang3.ClassUtils.getClass

Upstream Patch Reference: https://github.com/apache/commons-lang/commit/b424803abdb2bec818e4fbcb251ce031c22aca53.patch
---
src/changes/changes.xml | 1 +
.../org/apache/commons/lang3/ClassUtils.java | 46 +++++++++----------
2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5731324..dd2577b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -47,6 +47,7 @@ The <action> type attribute can be add,update,fix,remove.

<release version="3.8.1" date="2018-09-19" description="This release is a bugfix for Restoring Bundle-SymbolicName in the MANIFEST.mf file.">
<action issue="LANG-1419" type="fix" dev="chtompki">Restore BundleSymbolicName for OSGi</action>
+ <action type="fix" dev="ggregory" due-to="OSS-Fuzz, Gary Gregory">Rewrite ClassUtils.getClass(...) without recursion to avoid StackOverflowError on very long inputs. OSS-Fuzz Issue 42522972: apache-commons-text:StringSubstitutorInterpolatorFuzzer: Security exception in org.apache.commons.lang3.ClassUtils.getClass.</action>
</release>

<release version="3.8" date="2018-08-15" description="New features and bug fixes. Requires Java 7, supports Java 8, 9, 10.">
diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index be9f0dd..a9ec195 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -985,30 +985,27 @@ public class ClassUtils {
*/
public static Class<?> getClass(
final ClassLoader classLoader, final String className, final boolean initialize) throws ClassNotFoundException {
- try {
- Class<?> clazz;
- if (namePrimitiveMap.containsKey(className)) {
- clazz = namePrimitiveMap.get(className);
- } else {
- clazz = Class.forName(toCanonicalName(className), initialize, classLoader);
- }
- return clazz;
- } catch (final ClassNotFoundException ex) {
- // allow path separators (.) as inner class name separators
- final int lastDotIndex = className.lastIndexOf(PACKAGE_SEPARATOR_CHAR);
-
- if (lastDotIndex != -1) {
- try {
- return getClass(classLoader, className.substring(0, lastDotIndex) +
- INNER_CLASS_SEPARATOR_CHAR + className.substring(lastDotIndex + 1),
- initialize);
- } catch (final ClassNotFoundException ex2) { // NOPMD
- // ignore exception
+ // This method was re-written to avoid recursion and stack overflows found by fuzz testing.
+ String next = className;
+ int lastDotIndex = -1;
+ do {
+ try {
+ Class<?> clazz;
+ if (namePrimitiveMap.containsKey(next)) {
+ clazz = namePrimitiveMap.get(next);
+ } else {
+ clazz = Class.forName(toCanonicalName(next), initialize, classLoader);
+ }
+ return clazz;
+ } catch (final ClassNotFoundException ex) {
+ lastDotIndex = next.lastIndexOf(PACKAGE_SEPARATOR_CHAR);
+ if (lastDotIndex != -1) {
+ next = next.substring(0, lastDotIndex) +
+ INNER_CLASS_SEPARATOR_CHAR + next.substring(lastDotIndex + 1);
}
}
-
- throw ex;
- }
+ } while (lastDotIndex != -1);
+ throw new ClassNotFoundException(next);
}

/**
@@ -1124,9 +1121,10 @@ public class ClassUtils {
private static String toCanonicalName(String className) {
className = StringUtils.deleteWhitespace(className);
Validate.notNull(className, "className must not be null.");
- if (className.endsWith("[]")) {
+ final String arrayMarker = "[]";
+ if (className.endsWith(arrayMarker)) {
final StringBuilder classNameBuffer = new StringBuilder();
- while (className.endsWith("[]")) {
+ while (className.endsWith(arrayMarker)) {
className = className.substring(0, className.length() - 2);
classNameBuffer.append("[");
}
--
2.34.1

9 changes: 7 additions & 2 deletions SPECS/apache-commons-lang3/apache-commons-lang3.spec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Summary: Apache Commons Lang Package
Name: apache-%{short_name}
Version: 3.8.1
Release: 5%{?dist}
Release: 6%{?dist}
License: Apache-2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand All @@ -27,6 +27,7 @@ URL: https://commons.apache.org/proper/commons-lang
Source0: https://archive.apache.org/dist/commons/lang/source/%{short_name}-%{version}-src.tar.gz
Source1: build.xml
Source2: default.properties
Patch0: CVE-2025-48924.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: fdupes
Expand Down Expand Up @@ -57,7 +58,8 @@ Group: Documentation/HTML
Javadoc for %{name}.

%prep
%setup -q -n %{short_name}-%{version}-src

%autosetup -n %{short_name}-%{version}-src -p1
cp %{SOURCE1} .
cp %{SOURCE2} .
sed -i 's/\r//' *.txt
Expand Down Expand Up @@ -98,6 +100,9 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}

%changelog
* Wed Jul 16 2025 Aninda Pradhan <[email protected]> - 3.8.1-6
- Addressed CVE-2025-48924

* Fri Mar 17 2023 Mykhailo Bykhovtsev <[email protected]> - 3.8.1-5
- Moved from extended to core
- License verified
Expand Down
30 changes: 30 additions & 0 deletions SPECS/apparmor/CVE-2023-53154.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From 1dfb03ca74b78ff4a87b48a70b91a5cfc985f9c4 Mon Sep 17 00:00:00 2001
From: dj_palli <[email protected]>
Date: Thu, 12 Jun 2025 20:49:56 +0000
Subject: [PATCH] Address CVE-2023-53154

Upstream Patch Reference: https://github.com/DaveGamble/cJSON/commit/3ef4e4e730e5efd381be612df41e1ff3f5bb3c32

---
binutils/cJSON.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/binutils/cJSON.c b/binutils/cJSON.c
index e85ac11..45c1c45 100644
--- a/binutils/cJSON.c
+++ b/binutils/cJSON.c
@@ -1650,6 +1650,11 @@ static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_bu
current_item = new_item;
}

+ if (cannot_access_at_index(input_buffer, 1))
+ {
+ goto fail; /* nothing comes after the comma */
+ }
+
/* parse the name of the child */
input_buffer->offset++;
buffer_skip_whitespace(input_buffer);
--
2.45.2

Loading
Loading