Skip to content

Commit c294274

Browse files
[AUTO-CHERRYPICK] Adding systemd patch for CVE-2023-7008 - branch 3.0-dev (#11911)
Co-authored-by: Aditya Dubey <110563293+Adub17030MS@users.noreply.github.com>
1 parent a66cf43 commit c294274

3 files changed

Lines changed: 51 additions & 4 deletions

File tree

SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Version: 255
1414
# determine the build information from local checkout
1515
Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
1616
%endif
17-
Release: 19%{?dist}
17+
Release: 20%{?dist}
1818
License: LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later
1919
Vendor: Microsoft Corporation
2020
Distribution: Azure Linux
@@ -93,6 +93,10 @@ popd
9393
/boot/efi/EFI/BOOT/grubx64.efi
9494

9595
%changelog
96+
* Fri Jan 10 2024 Aditya Dubey <adityadubey@microsoft.com> - 255-20
97+
- Updating to version 255-19
98+
- Includes patch for enhancing DNSSEC signature validation integrity
99+
96100
* Thu Dec 12 2024 Daniel McIlvaney <damcilva@microsoft.com> - 255-19
97101
- Version bump to force signing with new Azure Linux secure boot key
98102
- Add confilcts/recommends on shim to ensure the keys match

SPECS/systemd/CVE-2023-7008.patch

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From 43124825d209452d677c267c96da3592e418fca9 Mon Sep 17 00:00:00 2001
2+
From: Michal Sekletar <msekleta@redhat.com>
3+
Date: Wed, 20 Dec 2023 16:44:14 +0100
4+
Subject: [PATCH] resolved: actually check authenticated flag of SOA
5+
transaction
6+
7+
Fixes #25676
8+
9+
(cherry picked from commit 3b4cc1437b51fcc0b08da8cc3f5d1175eed25eb1)
10+
11+
Resolves: RHEL-6216
12+
---
13+
src/resolve/resolved-dns-transaction.c | 4 ++--
14+
1 file changed, 2 insertions(+), 2 deletions(-)
15+
16+
diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
17+
index 0212569fb03..0306af84a21 100644
18+
--- a/src/resolve/resolved-dns-transaction.c
19+
+++ b/src/resolve/resolved-dns-transaction.c
20+
@@ -2800,7 +2800,7 @@ static int dns_transaction_requires_rrsig(DnsTransaction *t, DnsResourceRecord *
21+
if (r == 0)
22+
continue;
23+
24+
- return FLAGS_SET(t->answer_query_flags, SD_RESOLVED_AUTHENTICATED);
25+
+ return FLAGS_SET(dt->answer_query_flags, SD_RESOLVED_AUTHENTICATED);
26+
}
27+
28+
return true;
29+
@@ -2827,7 +2827,7 @@ static int dns_transaction_requires_rrsig(DnsTransaction *t, DnsResourceRecord *
30+
/* We found the transaction that was supposed to find the SOA RR for us. It was
31+
* successful, but found no RR for us. This means we are not at a zone cut. In this
32+
* case, we require authentication if the SOA lookup was authenticated too. */
33+
- return FLAGS_SET(t->answer_query_flags, SD_RESOLVED_AUTHENTICATED);
34+
+ return FLAGS_SET(dt->answer_query_flags, SD_RESOLVED_AUTHENTICATED);
35+
}
36+
37+
return true;
38+

SPECS/systemd/systemd.spec

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Version: 255
5050
# determine the build information from local checkout
5151
Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
5252
%endif
53-
Release: 19%{?dist}
53+
Release: 20%{?dist}
5454

5555
# FIXME - hardcode to 'stable' for now as that's what we have in our blobstore
5656
%global stable 1
@@ -142,6 +142,7 @@ Patch0491: azurelinux-use-system-auth-in-pam-systemd-user.patch
142142
# Patches for Azure Linux
143143
Patch0900: do-not-test-openssl-sm3.patch
144144
Patch0901: networkd-default-use-domains.patch
145+
Patch0902: CVE-2023-7008.patch
145146

146147
%ifarch %{ix86} x86_64
147148
%global want_bootloader 1
@@ -1216,6 +1217,10 @@ rm -f %{name}.lang
12161217
# %autochangelog. So we need to continue manually maintaining the
12171218
# changelog here.
12181219
%changelog
1220+
* Fri Jan 10 2025 Aditya Dubey <adityadubey@microsoft.com> - 255-20
1221+
- adding patch for enhancing DNSSEC signature validation integrity
1222+
- addresses CVE-2023-7008
1223+
12191224
* Thu Dec 12 2024 Daniel McIlvaney <damcilva@microsoft.com> - 255-19
12201225
- Version bump to force signing with new Azure Linux secure boot key
12211226

@@ -1237,7 +1242,7 @@ rm -f %{name}.lang
12371242
* Thu May 02 2024 Rachel Menge <rachelmenge@microsoft.com> - 255-13
12381243
- Supply 10-console-messages.conf sysctl to lower the default kernel messages to the console
12391244

1240-
* Thu Apr 18 2024 Dan Streetman <ddstreet@microsoft.com> - 255-12
1245+
* Thu Apr 25 2024 Dan Streetman <ddstreet@microsoft.com> - 255-12
12411246
- move libidn2 recommends from core package to systemd-networkd
12421247

12431248
* Wed Apr 24 2024 Dan Streetman <ddstreet@microsoft.com> - 255-11
@@ -1253,7 +1258,7 @@ rm -f %{name}.lang
12531258
* Mon Mar 11 2024 Daniel McIlvaney <damcilva@microsoft.com> - 255-8
12541259
- Obsolete the new systemd-bootstrap-libs subpacakge.
12551260

1256-
* Thu Feb 22 2024 Dan Streetman <ddstreet@microsoft.com> - 255-7
1261+
* Thu Feb 29 2024 Dan Streetman <ddstreet@microsoft.com> - 255-7
12571262
- remove use of %%azure (or %%azl) macro
12581263

12591264
* Wed Feb 28 2024 Dan Streetman <ddstreet@microsoft.com> - 255-6

0 commit comments

Comments
 (0)