Skip to content

Commit aae120c

Browse files
elelayshsjpb
andauthored
Update RockyLinux 8.10 inc. OpenHPC v2.10, disable act_pedit (#994)
* Update RL8 timestamps to fix CVE-2026-46331 Not updating RL98 because the 5.14.0-687.17.1.el9_8 kernel breaks DOCA OFED (change interface of dpll_pin_ops.ffo_get in commit 9c11fcb of linux) Not updating OHPC timestamps: OHPC 2.10 has an upgraded Slurm 25.11 which is too much of an upgrade to carry for this PR. * Mitigate CVE-2026-46331 (pedit-COW) * Rebuilt image * update RL8 timestamps again * bump CI image * DEBUG: slurm backup * fix slurmdb upgrade * update grype GO vuln aliases again * remove debug changes * remove unneeded openhpc overrides after openhpc upgrade * bump CI image * change more grype aliases * bump stackhpc.openhpc to release * fix grype aliases, again * remove unused grype ignores --------- Co-authored-by: Steve Brasier <steveb@stackhpc.com>
1 parent 91e9294 commit aae120c

9 files changed

Lines changed: 178 additions & 107 deletions

File tree

.grype.yaml

Lines changed: 140 additions & 85 deletions
Large diffs are not rendered by default.

ansible/mitigations.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,23 @@
7777
cmd: rmmod ip6_tunnel
7878
failed_when: false
7979
changed_when: true
80+
81+
- name: Apply pedit COW (CVE-2026-46331) mitigation
82+
hosts: mitigate_cve_2026_46331
83+
gather_facts: false
84+
become: true
85+
tasks:
86+
- name: Prevent modules loading
87+
ansible.builtin.copy:
88+
dest: /etc/modprobe.d/cve_2026_46331.conf
89+
owner: root
90+
group: root
91+
mode: u=rw,go=r
92+
content: |
93+
install act_pedit /bin/false
94+
# below probably is not needed but is safer
95+
- name: Unload modules
96+
ansible.builtin.command:
97+
cmd: rmmod act_pedit
98+
failed_when: false
99+
changed_when: true

ansible/slurm.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@
8484
- ansible.builtin.include_role:
8585
name: stackhpc.openhpc
8686
tasks_from: "{{ 'runtime.yml' if appliances_mode == 'configure' else 'main.yml' }}"
87-
vars:
88-
# We used python3.9 to install a recent pymysql version, with fixed SQL injection vulnerability
89-
# It is needed in the stackhpc.openhpc/tasks/upgrade.yml
90-
ansible_python_interpreter: /usr/bin/python3.9
9187

9288
- name: Flush handler
9389
ansible.builtin.meta: flush_handlers # get fresh ansible_local.slurm facts
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"cluster_image": {
3-
"RL8": "openhpc-RL8-260701-1309-c96fa636",
4-
"RL9": "openhpc-RL9-260701-1309-c96fa636"
3+
"RL8": "openhpc-RL8-260709-1110-095e2432",
4+
"RL9": "openhpc-RL9-260709-1110-095e2432"
55
}
66
}

environments/common/inventory/group_vars/all/dnf_repo_timestamps.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dnf_repos_default:
2020
OpenHPC-updates:
2121
'8':
2222
pulp_path: OpenHPC/2/updates/EL_8
23-
pulp_timestamp: 20250512T003315
23+
pulp_timestamp: 20260622T230143
2424
repo_file: OpenHPC
2525
'9':
2626
pulp_path: OpenHPC/3/updates/EL_9
@@ -47,7 +47,7 @@ dnf_repos_default:
4747
appstream:
4848
'8.10':
4949
pulp_path: rocky/8.10/AppStream/x86_64/os
50-
pulp_timestamp: 20260605T221539
50+
pulp_timestamp: 20260706T220507
5151
repo_file: Rocky-AppStream
5252
'9.4':
5353
pulp_path: rocky/9.4/AppStream/x86_64/os
@@ -72,7 +72,7 @@ dnf_repos_default:
7272
appstream-source:
7373
'8.10':
7474
pulp_path: rocky/8.10/AppStream/source/tree
75-
pulp_timestamp: 20260606T213518
75+
pulp_timestamp: 20260706T214107
7676
repo_file: Rocky-Sources
7777
'9.6':
7878
pulp_path: rocky/9.6/AppStream/source/tree
@@ -89,7 +89,7 @@ dnf_repos_default:
8989
baseos:
9090
'8.10':
9191
pulp_path: rocky/8.10/BaseOS/x86_64/os
92-
pulp_timestamp: 20260605T221539
92+
pulp_timestamp: 20260706T220507
9393
repo_file: Rocky-BaseOS
9494
'9.4':
9595
pulp_path: rocky/9.4/BaseOS/x86_64/os
@@ -114,7 +114,7 @@ dnf_repos_default:
114114
baseos-source:
115115
'8.10':
116116
pulp_path: rocky/8.10/BaseOS/source/tree
117-
pulp_timestamp: 20260606T213518
117+
pulp_timestamp: 20260706T214107
118118
repo_file: Rocky-Sources
119119
'9.6':
120120
pulp_path: rocky/9.6/BaseOS/source/tree
@@ -140,7 +140,7 @@ dnf_repos_default:
140140
cernvmfs_eessi_cfg:
141141
'8':
142142
pulp_path: eessi/rhel/8/noarch
143-
pulp_timestamp: 20251119T202303
143+
pulp_timestamp: 20260616T214234
144144
repo_file: cvmfs-config-eessi
145145
'9':
146146
pulp_path: eessi/rhel/8/noarch
@@ -158,7 +158,7 @@ dnf_repos_default:
158158
crb:
159159
'8.10':
160160
pulp_path: rocky/8.10/PowerTools/x86_64/os
161-
pulp_timestamp: 20260531T214327
161+
pulp_timestamp: 20260706T220507
162162
repo_file: Rocky-PowerTools
163163
repo_name: powertools
164164
'9.4':
@@ -202,7 +202,7 @@ dnf_repos_default:
202202
epel:
203203
'8':
204204
pulp_path: epel/8/Everything/x86_64
205-
pulp_timestamp: 20260610T221908
205+
pulp_timestamp: 20260706T214454
206206
repo_file: epel
207207
'9':
208208
pulp_path: epel/9/Everything/x86_64
@@ -216,7 +216,7 @@ dnf_repos_default:
216216
epel-source:
217217
'8':
218218
pulp_path: epel/8/Everything/source/tree
219-
pulp_timestamp: 20260610T221908
219+
pulp_timestamp: 20260706T214454
220220
repo_file: epel
221221
'9':
222222
pulp_path: epel/9/Everything/source/tree
@@ -250,7 +250,7 @@ dnf_repos_default:
250250
extras-source:
251251
'8.10':
252252
pulp_path: rocky/8.10/extras/source/tree
253-
pulp_timestamp: 20260506T212931
253+
pulp_timestamp: 20260625T224657
254254
repo_file: Rocky-Sources
255255
'9.6':
256256
pulp_path: rocky/9.6/extras/source/os
@@ -267,7 +267,7 @@ dnf_repos_default:
267267
grafana:
268268
'8':
269269
pulp_path: grafana/oss/rpm
270-
pulp_timestamp: 20260610T211431
270+
pulp_timestamp: 20260701T070549
271271
repo_file: grafana
272272
'9':
273273
pulp_path: grafana/oss/rpm

environments/common/inventory/group_vars/all/openhpc.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@ openhpc_state_save_location: "{{ appliances_state_dir + '/slurmctld' if applianc
5353
openhpc_config_extra: {}
5454

5555
# additional default slurm.conf parameters for the appliance:
56-
openhpc_config_default:
57-
TaskPlugin: task/cgroup,task/affinity
58-
ProctrackType: proctrack/cgroup
59-
JobAcctGatherType: jobacct_gather/cgroup
56+
openhpc_config_default: {}
6057

6158
# additional default slurm.conf parameters when "rebuild" enabled:
6259
openhpc_config_rebuild:

environments/common/inventory/groups

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,3 +241,4 @@ doca
241241
[mitigate_dirtyfrag]
242242
[mitigate_ssh_keysign_pwn]
243243
[mitigate_cve_2026_43037]
244+
[mitigate_cve_2026_46331]

environments/site/inventory/groups

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,3 +224,5 @@ builder
224224
builder
225225
[mitigate_cve_2026_43037:children]
226226
builder
227+
[mitigate_cve_2026_46331:children]
228+
builder

requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ roles:
44
version: v26.2.1
55
name: stackhpc.nfs
66
- src: https://github.com/stackhpc/ansible-role-openhpc.git
7-
version: v1.5.0
7+
version: v1.6.0
88
name: stackhpc.openhpc
99
- src: https://github.com/stackhpc/ansible-grafana.git
1010
name: cloudalchemy.grafana

0 commit comments

Comments
 (0)