aed3ae164a
* Fri Aug 02 2024 Scott Weaver <scweaver@redhat.com> [5.14.0-490.el9] - redhat/dracut-virt.conf: add systemd-veritysetup module (Emanuele Giuseppe Esposito) [RHEL-45168] - redhat/uki_addons/virt: add common FIPS addon (Emanuele Giuseppe Esposito) [RHEL-45160] - redhat/kernel.spec: add uki_addons to create UKI kernel cmdline addons (Emanuele Giuseppe Esposito) [RHEL-45159] - gcc-plugins/stackleak: Avoid .head.text section (Bandan Das) [RHEL-39439] - x86/sev: Skip ROM range scans and validation for SEV-SNP guests (Bandan Das) [RHEL-39439] - x86/sev: Move early startup code into .head.text section (Bandan Das) [RHEL-39439] - x86/sme: Move early SME kernel encryption handling into .head.text (Bandan Das) [RHEL-39439] - x86/sev: Do the C-bit verification only on the BSP (Bandan Das) [RHEL-39439] - x86/sev: Fix kernel crash due to late update to read-only ghcb_version (Bandan Das) [RHEL-39439] - xfrm6: check ip6_dst_idev() return value in xfrm6_get_saddr() (CKI Backport Bot) [RHEL-48140] {CVE-2024-40959} - eeprom: at24: fix memory corruption race condition (Mark Salter) [RHEL-37020] {CVE-2024-35848} - eeprom: at24: Probe for DDR3 thermal sensor in the SPD case (Mark Salter) [RHEL-37020] {CVE-2024-35848} - eeprom: at24: Use dev_err_probe for nvmem register failure (Mark Salter) [RHEL-37020] {CVE-2024-35848} - eeprom: at24: Add support for 24c1025 EEPROM (Mark Salter) [RHEL-37020] {CVE-2024-35848} - eeprom: at24: remove struct at24_client (Mark Salter) [RHEL-37020] {CVE-2024-35848} - at24: Support probing while in non-zero ACPI D state (Mark Salter) [RHEL-37020] {CVE-2024-35848} - selftests: forwarding: devlink_lib: Wait for udev events after reloading (Mark Langsdorf) [RHEL-47652] {CVE-2024-39501} - drivers: core: synchronize really_probe() and dev_uevent() (Mark Langsdorf) [RHEL-47652] {CVE-2024-39501} - xhci: Handle TD clearing for multiple streams case (CKI Backport Bot) [RHEL-47892] {CVE-2024-40927} - PCI: pciehp: Retain Power Indicator bits for userspace indicators (Myron Stowe) [RHEL-41181] - sched: act_ct: take care of padding in struct zones_ht_key (Xin Long) [RHEL-50682] - net: bridge: xmit: make sure we have at least eth header len bytes (cki-backport-bot) [RHEL-44297] {CVE-2024-38538} - hugetlb: force allocating surplus hugepages on mempolicy allowed nodes (Aristeu Rozanski) [RHEL-38605] - USB: class: cdc-wdm: Fix CPU lockup caused by excessive log messages (CKI Backport Bot) [RHEL-47558] {CVE-2024-40904} - scsi: mpt3sas: Avoid test/set_bit() operating in non-allocated memory (CKI Backport Bot) [RHEL-47535] {CVE-2024-40901} - vmxnet3: update to version 9 (Izabela Bakollari) [RHEL-50675] - vmxnet3: add command to allow disabling of offloads (Izabela Bakollari) [RHEL-50675] - vmxnet3: add latency measurement support in vmxnet3 (Izabela Bakollari) [RHEL-50675] - vmxnet3: prepare for version 9 changes (Izabela Bakollari) [RHEL-50675] - vmxnet3: disable rx data ring on dma allocation failure (Izabela Bakollari) [RHEL-50675] - vmxnet3: Fix missing reserved tailroom (Izabela Bakollari) [RHEL-50675] - maple_tree: fix mas_empty_area_rev() null pointer dereference (Aristeu Rozanski) [RHEL-39862] {CVE-2024-36891} - rbd: don't assume rbd_is_lock_owner() for exclusive mappings (Ilya Dryomov) [RHEL-50366] - rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings (Ilya Dryomov) [RHEL-50366] - rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait (Ilya Dryomov) [RHEL-50366] - scsi: qedf: Set qed_slowpath_params to zero before use (John Meneghini) [RHEL-25193] - scsi: qedf: Wait for stag work during unload (John Meneghini) [RHEL-25193] - scsi: qedf: Don't process stag work during unload and recovery (John Meneghini) [RHEL-25193] - scsi: qedf: Use FC rport as argument for qedf_initiate_tmf() (John Meneghini) [RHEL-25193] - net: fix __dst_negative_advice() race (Xin Long) [RHEL-41185] {CVE-2024-36971} - net: annotate data-races around sk->sk_dst_pending_confirm (Xin Long) [RHEL-41185] - scsi: qla2xxx: Fix off by one in qla_edif_app_getstats() (Ewan D. Milne) [RHEL-39719] {CVE-2024-36025} - igb: Remove redundant runtime resume for ethtool_ops (Corinna Vinschen) [RHEL-17487] - net: intel: implement modern PM ops declarations (Corinna Vinschen) [RHEL-17487] - igb: simplify pci ops declaration (Corinna Vinschen) [RHEL-17487] - igb: Fix missing time sync events (Corinna Vinschen) [RHEL-17487] - intel: make module parameters readable in sys filesystem (Corinna Vinschen) [RHEL-17487 RHEL-25998] - net: adopt skb_network_offset() and similar helpers (Corinna Vinschen) [RHEL-17487] - igb: extend PTP timestamp adjustments to i211 (Corinna Vinschen) [RHEL-17487] - net: intel: igb: Use linkmode helpers for EEE (Corinna Vinschen) [RHEL-17487] - igb: Fix string truncation warnings in igb_set_fw_version (Corinna Vinschen) [RHEL-17487 RHEL-38454] {CVE-2024-36010} - intel: legacy: field get conversion (Corinna Vinschen) [RHEL-17487] - intel: legacy: field prep conversion (Corinna Vinschen) [RHEL-17487] - intel: add bit macro includes where needed (Corinna Vinschen) [RHEL-17487] - igb: Use FIELD_GET() to extract Link Width (Corinna Vinschen) [RHEL-17487] - netdevsim: fix rtnetlink.sh selftest (CKI Backport Bot) [RHEL-50016] - selinux: avoid dereference of garbage after mount failure (Ondrej Mosnacek) [RHEL-37187] {CVE-2024-35904} - calipso: fix memory leak in netlbl_calipso_add_pass() (Ondrej Mosnacek) [RHEL-37044] {CVE-2023-52698} - powerpc/pseries: Whitelist dtl slub object for copying to userspace (Mamatha Inamdar) [RHEL-51242] {CVE-2024-41065} - tcp: Fix shift-out-of-bounds in dctcp_update_alpha(). (CKI Backport Bot) [RHEL-44414] {CVE-2024-37356} - tty: add the option to have a tty reject a new ldisc (John W. Linville) [RHEL-48254] {CVE-2024-40966} - irqchip/gic-v3-its: Prevent double free on error (Charles Mirabile) [RHEL-37024] {CVE-2024-35847} - usb-storage: alauda: Check whether the media is initialized (CKI Backport Bot) [RHEL-43714] {CVE-2024-38619} - scsi: ibmvfc: Remove BUG_ON in the case of an empty event pool (Ewan D. Milne) [RHEL-38285] {CVE-2023-52811} - gfs2: Fix potential glock use-after-free on unmount (Andreas Gruenbacher) [RHEL-44155] {CVE-2024-38570} - gfs2: simplify gdlm_put_lock with out_free label (Andreas Gruenbacher) [RHEL-44155] {CVE-2024-38570} - gfs2: Remove ill-placed consistency check (Andreas Gruenbacher) [RHEL-44155] {CVE-2024-38570} - openvswitch: Set the skbuff pkt_type for proper pmtud support. (Aaron Conole) [RHEL-37650] - scsi: mpi3mr: Driver version update to 8.8.1.0.50 (Ewan D. Milne) [RHEL-30580] - scsi: mpi3mr: Update MPI Headers to revision 31 (Ewan D. Milne) [RHEL-30580] - scsi: mpi3mr: Debug ability improvements (Ewan D. Milne) [RHEL-30580] - scsi: mpi3mr: Set the WriteSame Divert Capability in the IOCInit MPI Request (Ewan D. Milne) [RHEL-30580] - scsi: mpi3mr: Clear ioctl blocking flag for an unresponsive controller (Ewan D. Milne) [RHEL-30580] - scsi: mpi3mr: Set MPI request flags appropriately (Ewan D. Milne) [RHEL-30580] - scsi: mpi3mr: Block devices are not removed even when VDs are offlined (Ewan D. Milne) [RHEL-30580] - x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk (Waiman Long) [RHEL-31230] - x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO (Waiman Long) [RHEL-31230] - x86/bugs: Fix the SRSO mitigation on Zen3/4 (Waiman Long) [RHEL-31230] - redhat/configs: Rename x86 CPU mitigations config entries (Waiman Long) [RHEL-31230] - x86/bugs: Rename CONFIG_RETHUNK => CONFIG_MITIGATION_RETHUNK (Waiman Long) [RHEL-31230] - x86/bugs: Rename CONFIG_CPU_SRSO => CONFIG_MITIGATION_SRSO (Waiman Long) [RHEL-31230] - x86/bugs: Rename CONFIG_CPU_IBRS_ENTRY => CONFIG_MITIGATION_IBRS_ENTRY (Waiman Long) [RHEL-31230] - x86/bugs: Rename CONFIG_CPU_UNRET_ENTRY => CONFIG_MITIGATION_UNRET_ENTRY (Waiman Long) [RHEL-31230] - x86/bugs: Rename CONFIG_SLS => CONFIG_MITIGATION_SLS (Waiman Long) [RHEL-31230] - x86/bugs: Rename CONFIG_RETPOLINE => CONFIG_MITIGATION_RETPOLINE (Waiman Long) [RHEL-31230] - x86/bugs: Rename CONFIG_PAGE_TABLE_ISOLATION => CONFIG_MITIGATION_PAGE_TABLE_ISOLATION (Waiman Long) [RHEL-31230] - x86/bugs: Rename CONFIG_CALL_DEPTH_TRACKING => CONFIG_MITIGATION_CALL_DEPTH_TRACKING (Waiman Long) [RHEL-31230] - x86/bugs: Rename CONFIG_CPU_IBPB_ENTRY => CONFIG_MITIGATION_IBPB_ENTRY (Waiman Long) [RHEL-31230] - x86/bugs: Rename CONFIG_GDS_FORCE_MITIGATION => CONFIG_MITIGATION_GDS_FORCE (Waiman Long) [RHEL-31230] - kbuild: use objtool-args-y to clean up objtool arguments (Waiman Long) [RHEL-31230] - kbuild: do not create *.prelink.o for Clang LTO or IBT (Waiman Long) [RHEL-31230] - kbuild: replace $(linked-object) with CONFIG options (Waiman Long) [RHEL-31230] Resolves: RHEL-17487, RHEL-25193, RHEL-25998, RHEL-30580, RHEL-31230, RHEL-37020, RHEL-37024, RHEL-37044, RHEL-37187, RHEL-37650, RHEL-38285, RHEL-38454, RHEL-38605, RHEL-39439, RHEL-39719, RHEL-39862, RHEL-41181, RHEL-41185, RHEL-43714, RHEL-44155, RHEL-44297, RHEL-44414, RHEL-45159, RHEL-45160, RHEL-45168, RHEL-47535, RHEL-47558, RHEL-47652, RHEL-47892, RHEL-48140, RHEL-48254, RHEL-50016, RHEL-50366, RHEL-50675, RHEL-50682, RHEL-51242, RHEL-37025, RHEL-38286, RHEL-39720, RHEL-39863, RHEL-37021, RHEL-44156, RHEL-38455, RHEL-44298, RHEL-43715, RHEL-37045, RHEL-37188, RHEL-41186, RHEL-47536, RHEL-47559, RHEL-47893, RHEL-48141, RHEL-47653, RHEL-48255, RHEL-44415 Signed-off-by: Scott Weaver <scweaver@redhat.com>
152 lines
5.0 KiB
Python
Executable File
152 lines
5.0 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
#
|
|
# This script inspects a given json proving a list of addons, and
|
|
# creates an addon for each key/value pair matching the given uki, distro and
|
|
# arch provided in input.
|
|
#
|
|
# Usage: python uki_create_addons.py input_json out_dir uki distro arch
|
|
#
|
|
# This tool requires the systemd-ukify and systemd-boot packages.
|
|
#
|
|
# Addon file
|
|
#-----------
|
|
# Each addon terminates with .addon
|
|
# Each addon contains only two types of lines:
|
|
# Lines beginning with '#' are description and thus ignored
|
|
# All other lines are command line to be added.
|
|
# The name of the end resulting addon is taken from the json hierarchy.
|
|
# For example, and addon in json['virt']['rhel']['x86_64']['hello.addon'] will
|
|
# result in an UKI addon file generated in out_dir called
|
|
# hello-virt.rhel.x86_64.addon.efi
|
|
#
|
|
# The common key, present in any sub-dict in the provided json (except the leaf dict)
|
|
# is used as place for default addons when the same addon is not defined deep
|
|
# in the hierarchy. For example, if we define test.addon (text: 'test1\n') in
|
|
# json['common']['test.addon'] = ['test1\n'] and another test.addon (text: test2) in
|
|
# json['virt']['common']['test.addon'] = ['test2'], any other uki except virt
|
|
# will have a test.addon.efi with text "test1", and virt will have a
|
|
# test.addon.efi with "test2"
|
|
#
|
|
# sbat.conf
|
|
#----------
|
|
# This dict is containing the sbat string for *all* addons being created.
|
|
# This dict is optional, but when used has to be put in a sub-dict with
|
|
# { 'sbat' : { 'sbat.conf' : ['your text here'] }}
|
|
# It follows the same syntax as the addon files, meaning '#' is comment and
|
|
# the rest is taken as sbat string and feed to ukify.
|
|
|
|
import os
|
|
import sys
|
|
import json
|
|
import collections
|
|
import subprocess
|
|
|
|
|
|
UKIFY_PATH = '/usr/lib/systemd/ukify'
|
|
|
|
def usage(err):
|
|
print(f'Usage: {os.path.basename(__file__)} input_json output_dir uki distro arch')
|
|
print(f'Error:{err}')
|
|
sys.exit(1)
|
|
|
|
def check_clean_arguments(input_json, out_dir):
|
|
# Remove end '/'
|
|
if out_dir[-1:] == '/':
|
|
out_dir = out_dir[:-1]
|
|
if not os.path.isfile(input_json):
|
|
usage(f'input_json {input_json} is not a file, or does not exist!')
|
|
if not os.path.isdir(out_dir):
|
|
usage(f'out_dir_dir {out_dir} is not a dir, or does not exist!')
|
|
return out_dir
|
|
|
|
UKICmdlineAddon = collections.namedtuple('UKICmdlineAddon', ['name', 'cmdline'])
|
|
uki_addons_list = []
|
|
uki_addons = {}
|
|
addon_sbat_string = None
|
|
|
|
def parse_lines(lines, rstrip=True):
|
|
cmdline = ''
|
|
for l in lines:
|
|
l = l.lstrip()
|
|
if not l:
|
|
continue
|
|
if l[0] == '#':
|
|
continue
|
|
# rstrip is used only for addons cmdline, not sbat.conf, as it replaces
|
|
# return lines with spaces.
|
|
if rstrip:
|
|
l = l.rstrip() + ' '
|
|
cmdline += l
|
|
if cmdline == '':
|
|
return ''
|
|
return cmdline
|
|
|
|
def parse_all_addons(in_obj):
|
|
global addon_sbat_string
|
|
|
|
for el in in_obj.keys():
|
|
# addon found: copy it in our global dict uki_addons
|
|
if el.endswith('.addon'):
|
|
uki_addons[el] = in_obj[el]
|
|
|
|
if 'sbat' in in_obj and 'sbat.conf' in in_obj['sbat']:
|
|
# sbat.conf found: override sbat with the most specific one found
|
|
addon_sbat_string = parse_lines(in_obj['sbat']['sbat.conf'], rstrip=False)
|
|
|
|
def recursively_find_addons(in_obj, folder_list):
|
|
# end of recursion, leaf directory. Search all addons here
|
|
if len(folder_list) == 0:
|
|
parse_all_addons(in_obj)
|
|
return
|
|
|
|
# first, check for common folder
|
|
if 'common' in in_obj:
|
|
parse_all_addons(in_obj['common'])
|
|
|
|
# second, check if there is a match with the searched folder
|
|
if folder_list[0] in in_obj:
|
|
folder_next = in_obj[folder_list[0]]
|
|
folder_list = folder_list[1:]
|
|
recursively_find_addons(folder_next, folder_list)
|
|
|
|
def parse_in_json(in_json, uki_name, distro, arch):
|
|
with open(in_json, 'r') as f:
|
|
in_obj = json.load(f)
|
|
recursively_find_addons(in_obj, [uki_name, distro, arch])
|
|
|
|
for addon_name, cmdline in uki_addons.items():
|
|
addon_name = addon_name.replace(".addon","")
|
|
addon_full_name = f'{addon_name}-{uki_name}.{distro}.{arch}.addon.efi'
|
|
cmdline = parse_lines(cmdline).rstrip()
|
|
if cmdline:
|
|
uki_addons_list.append(UKICmdlineAddon(addon_full_name, cmdline))
|
|
|
|
def create_addons(out_dir):
|
|
for uki_addon in uki_addons_list:
|
|
out_path = os.path.join(out_dir, uki_addon.name)
|
|
cmd = [
|
|
f'{UKIFY_PATH}', 'build',
|
|
f'--cmdline="{uki_addon.cmdline}"',
|
|
f'--output={out_path}']
|
|
if addon_sbat_string:
|
|
cmd.append('--sbat="' + addon_sbat_string.rstrip() +'"')
|
|
|
|
subprocess.check_call(cmd, text=True)
|
|
|
|
if __name__ == "__main__":
|
|
argc = len(sys.argv) - 1
|
|
if argc != 5:
|
|
usage('too few or too many parameters!')
|
|
|
|
input_json = sys.argv[1]
|
|
out_dir = sys.argv[2]
|
|
uki_name = sys.argv[3]
|
|
distro = sys.argv[4]
|
|
arch = sys.argv[5]
|
|
|
|
out_dir = check_clean_arguments(input_json, out_dir)
|
|
parse_in_json(input_json, uki_name, distro, arch)
|
|
create_addons(out_dir)
|
|
|
|
|