Skip to content

Commit d2f76c2

Browse files
authored
Enable nfsd v4 security label (#10605)
This is a security improvement. By turning on this config AZL3 provides security label support for NFSv4 server. This feature allows for fine grained security support for fine-grained security labels SELinux policies. Without this an NFSv4 mount will have the same label on each file.
1 parent 90673ff commit d2f76c2

12 files changed

Lines changed: 29 additions & 14 deletions

File tree

SPECS-SIGNED/kernel-signed/kernel-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
1212
Version: 6.6.51.1
13-
Release: 3%{?dist}
13+
Release: 4%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
145145
%exclude /module_info.ld
146146

147147
%changelog
148+
* Wed Oct 02 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.51.1-4
149+
- Bump release to match kernel
150+
148151
* Tue Sep 24 2024 Jo Zzsi <jozzsicsataban@gmail.com> - 6.6.51.1-3
149152
- Bump release to match kernel
150153

SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed Unified Kernel Image for %{buildarch} systems
77
Name: kernel-uki-signed-%{buildarch}
88
Version: 6.6.51.1
9-
Release: 3%{?dist}
9+
Release: 4%{?dist}
1010
License: GPLv2
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
@@ -68,6 +68,9 @@ popd
6868
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
6969

7070
%changelog
71+
* Wed Oct 02 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.51.1-4
72+
- Bump release to match kernel
73+
7174
* Tue Sep 24 2024 Jo Zzsi <jozzsicsataban@gmail.com> - 6.6.51.1-3
7275
- Bump release to match kernel
7376

SPECS/kernel-headers/kernel-headers.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Summary: Linux API header files
1515
Name: kernel-headers
1616
Version: 6.6.51.1
17-
Release: 3%{?dist}
17+
Release: 4%{?dist}
1818
License: GPLv2
1919
Vendor: Microsoft Corporation
2020
Distribution: Azure Linux
@@ -75,6 +75,9 @@ done
7575
%endif
7676

7777
%changelog
78+
* Wed Oct 02 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.51.1-4
79+
- Bump release to match kernel
80+
7881
* Tue Sep 24 2024 Jo Zzsi <jozzsicsataban@gmail.com> - 6.6.51.1-3
7982
- Bump release to match kernel
8083

SPECS/kernel/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7209,7 +7209,7 @@ CONFIG_NFSD_BLOCKLAYOUT=y
72097209
CONFIG_NFSD_SCSILAYOUT=y
72107210
CONFIG_NFSD_FLEXFILELAYOUT=y
72117211
# CONFIG_NFSD_V4_2_INTER_SSC is not set
7212-
# CONFIG_NFSD_V4_SECURITY_LABEL is not set
7212+
CONFIG_NFSD_V4_SECURITY_LABEL=y
72137213
CONFIG_GRACE_PERIOD=m
72147214
CONFIG_LOCKD=m
72157215
CONFIG_LOCKD_V4=y

SPECS/kernel/config_aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10266,7 +10266,7 @@ CONFIG_NFSD_BLOCKLAYOUT=y
1026610266
CONFIG_NFSD_SCSILAYOUT=y
1026710267
CONFIG_NFSD_FLEXFILELAYOUT=y
1026810268
# CONFIG_NFSD_V4_2_INTER_SSC is not set
10269-
# CONFIG_NFSD_V4_SECURITY_LABEL is not set
10269+
CONFIG_NFSD_V4_SECURITY_LABEL=y
1027010270
CONFIG_GRACE_PERIOD=m
1027110271
CONFIG_LOCKD=m
1027210272
CONFIG_LOCKD_V4=y

SPECS/kernel/kernel-uki.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
Summary: Unified Kernel Image
1919
Name: kernel-uki
2020
Version: 6.6.51.1
21-
Release: 3%{?dist}
21+
Release: 4%{?dist}
2222
License: GPLv2
2323
Vendor: Microsoft Corporation
2424
Distribution: Azure Linux
@@ -75,6 +75,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
7575
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
7676

7777
%changelog
78+
* Wed Oct 02 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.51.1-4
79+
- Bump release to match kernel
80+
7881
* Tue Sep 24 2024 Jo Zzsi <jozzsicsataban@gmail.com> - 6.6.51.1-3
7982
- Remove dbus from initrd
8083

SPECS/kernel/kernel.signatures.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"Signatures": {
33
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
4-
"config": "e4fca2e2d948f3e0d88f41ec66d463b95ffdc1f4f096693bc5734a0ef7262c56",
5-
"config_aarch64": "cc95198e3a70fa025f4ad78723d0e220a2a023edad31e89854d0e8ad84986209",
4+
"config": "bd071455eff0bdd8c93c6cdec7590b05dfe26bfead60fe2df71c2c722af11404",
5+
"config_aarch64": "c496a8275a29735e25105a86db16228e1bdde3d8ce7e0caa72d423b971d6cbda",
66
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
77
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
88
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",

SPECS/kernel/kernel.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
Summary: Linux Kernel
3131
Name: kernel
3232
Version: 6.6.51.1
33-
Release: 3%{?dist}
33+
Release: 4%{?dist}
3434
License: GPLv2
3535
Vendor: Microsoft Corporation
3636
Distribution: Azure Linux
@@ -407,6 +407,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
407407
%{_sysconfdir}/bash_completion.d/bpftool
408408

409409
%changelog
410+
* Wed Oct 02 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.51.1-4
411+
- Enable nfsd v4 security label
412+
410413
* Tue Sep 24 2024 Jo Zzsi <jozzsicsataban@gmail.com> - 6.6.51.1-3
411414
- UKI: remove dbus from initrd
412415

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.aarch64.rpm
2-
kernel-headers-6.6.51.1-3.azl3.noarch.rpm
2+
kernel-headers-6.6.51.1-4.azl3.noarch.rpm
33
glibc-2.38-8.azl3.aarch64.rpm
44
glibc-devel-2.38-8.azl3.aarch64.rpm
55
glibc-i18n-2.38-8.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.x86_64.rpm
2-
kernel-headers-6.6.51.1-3.azl3.noarch.rpm
2+
kernel-headers-6.6.51.1-4.azl3.noarch.rpm
33
glibc-2.38-8.azl3.x86_64.rpm
44
glibc-devel-2.38-8.azl3.x86_64.rpm
55
glibc-i18n-2.38-8.azl3.x86_64.rpm

0 commit comments

Comments
 (0)