diff options
62 files changed, 998 insertions, 617 deletions
diff --git a/.clang-format b/.clang-format index 6aa4e6a451..fe360a648b 100644 --- a/.clang-format +++ b/.clang-format @@ -27,22 +27,22 @@ AccessModifierOffset: -4 AlignAfterOpenBracket: AlwaysBreak AlignEscapedNewlines: Left -AlignOperands: false +AlignOperands: false AllowShortFunctionsOnASingleLine: None AlwaysBreakBeforeMultilineStrings: true AlwaysBreakTemplateDeclarations: Yes BinPackArguments: false BinPackParameters: false BraceWrapping: - AfterEnum: false + AfterEnum: false SplitEmptyFunction: false SplitEmptyRecord: false SplitEmptyNamespace: false BreakBeforeBraces: Custom -BreakInheritanceList: BeforeComma BreakBeforeTernaryOperators: false +BreakInheritanceList: BeforeComma BreakStringLiterals: false -ColumnLimit: 109 +ColumnLimit: 109 CompactNamespaces: true ConstructorInitializerAllOnOneLineOrOnePerLine: true ConstructorInitializerIndentWidth: 8 @@ -107,7 +107,7 @@ ForEachMacros: - STRV_FOREACH_BACKWARDS - STRV_FOREACH_PAIR IndentPPDirectives: AfterHash -IndentWidth: 8 +IndentWidth: 8 IndentWrappedFunctionNames: true MaxEmptyLinesToKeep: 2 PenaltyBreakAssignment: 65 @@ -117,8 +117,10 @@ PenaltyBreakFirstLessLess: 50 PenaltyBreakString: 0 PenaltyExcessCharacter: 10 PenaltyReturnTypeOnItsOwnLine: 100 +PointerAlignment: Right SpaceAfterCStyleCast: true +SpaceAroundPointerQualifiers: Both SpaceBeforeParens: ControlStatementsExceptForEachMacros -SpacesInAngles: true -TabWidth: 8 -UseCRLF: false +SpacesInAngles: true +TabWidth: 8 +UseCRLF: false @@ -29,19 +29,19 @@ CHANGES WITH 251: and backward compatibility broken instead on the assumption that nobody can be affected given the current state of this interface. - * All kernels supported by systemd mix RDRAND (or similar) into the - entropy pool at early boot. This means that on those systems, even if - /dev/urandom is not yet initialized, it still returns bytes that - are at least as high quality as RDRAND. For that reason, we no longer - have reason to invoke RDRAND from systemd itself, which has - historically been a source of bugs. Furthermore, kernels ≥5.6 provide - the getrandom(GRND_INSECURE) interface for returning random bytes - before the entropy pool is initialized without warning into kmsg, - which is what we attempt to use if available. systemd's direct usage - of RDRAND has been removed. x86 systems ≥Broadwell that are running - an older kernel may experience kmsg warnings that were not seen with - 250. For newer kernels, non-x86 systems, or older x86 systems, there - should be no visible changes. + * All kernels supported by systemd mix bytes returned by RDRAND (or + similar) into the entropy pool at early boot. This means that on + those systems, even if /dev/urandom is not yet initialized, it still + returns bytes that are of at least RDRAND quality. For that reason, + we no longer have reason to invoke RDRAND from systemd itself, which + has historically been a source of bugs. Furthermore, kernels ≥5.6 + provide the getrandom(GRND_INSECURE) interface for returning random + bytes before the entropy pool is initialized without warning into + kmsg, which is what we attempt to use if available. systemd's direct + usage of RDRAND has been removed. x86 systems ≥Broadwell that are + running an older kernel may experience kmsg warnings that were not + seen with 250. For newer kernels, non-x86 systems, or older x86 + systems, there should be no visible changes. * sd-boot will now measure the kernel command line into TPM PCR 12 rather than PCR 8. This improves usefulness of the measurements on @@ -59,11 +59,10 @@ CHANGES WITH 251: * busctl capture now writes output in the newer pcapng format instead of pcap. - * A udev rule that imported hwdb matches for USB devices with - lowercase hexadecimal vendor/product ID digits was added in systemd - 250. This has been reverted, since uppercase hexadecimal digits are - supposed to be used, and we already had a rule for that with the - appropriate match. + * A udev rule that imported hwdb matches for USB devices with lowercase + hexadecimal vendor/product ID digits was added in systemd 250. This + has been reverted, since uppercase hexadecimal digits are supposed to + be used, and we already had a rule with the appropriate match. Users might need to adjust their local hwdb entries. @@ -1419,7 +1419,6 @@ Features: - teach it to copy in unified kernel images and maybe type #1 boot loader spec entries from host - make it operate on loopback files, dissecting enough to find ESP to operate on - bootspec: properly support boot attempt counters when parsing entry file names - - support --quiet in is-installed, update * kernel-install: - optionally, support generating type #2 entries instead of type #1, including signing them diff --git a/docs/BOOT_LOADER_SPECIFICATION.md b/docs/BOOT_LOADER_SPECIFICATION.md index 40ec2f152b..e96aac69c4 100644 --- a/docs/BOOT_LOADER_SPECIFICATION.md +++ b/docs/BOOT_LOADER_SPECIFICATION.md @@ -7,142 +7,93 @@ SPDX-License-Identifier: LGPL-2.1-or-later # The Boot Loader Specification -_TL;DR: Currently there's no common boot scheme across architectures and -platforms for open-source operating systems. There's also little cooperation -between multiple distributions in dual-boot (or triple, … multi-boot) -setups. We'd like to improve this situation by getting everybody to commit to a -single boot configuration format that is based on drop-in files, and thus is -robust, simple, works without rewriting configuration files and is free of -namespace clashes._ - -The Boot Loader Specification defines a scheme how different operating systems -can cooperatively manage a boot loader configuration directory, that accepts -drop-in files for boot menu items that are defined in a format that is shared -between various boot loader implementations, operating systems, and userspace -programs. The same scheme can be used to prepare OS media for cases where the -firmware includes a boot loader. The target audience for this specification is: +This document defines a set of file formats and naming conventions that allow +the boot loader configuration to be shared between multiple operating systems +and boot loaders installed on one device. + +Operating systems cooperatively manage a boot loader configuration directory +that contains drop-in files, making multi-boot scenarios easy to support. Boot +menu items are defined via a simple format that can be understood by different +boot loader implementations, operating systems, and userspace programs. The +same scheme can be used to prepare OS media for cases where the firmware +includes a boot loader. + +## Target audience + +The target audience for this specification is: * Boot loader developers, to write a boot loader that directly reads its - configuration at runtime from these drop-in snippets + configuration from these files * Firmware developers, to add generic boot loading support directly to the firmware itself -* Distribution and Core OS developers, in order to create these snippets at - OS/kernel package installation time -* UI developers, for implementing a user interface that discovers the available - boot options -* OS Installer developers, to prepare their installation media and for setting - up the initial drop-in directory - -## Why is there a need for this specification? - -Of course, without this specification things already work mostly fine. But here's why we think this specification is needed: - -* To make the boot more robust, as no explicit rewriting of configuration files - is required any more -* To allow an out of the box boot experience on any platform without the need - of traditional firmware mechanisms (e.g. BIOS calls, UEFI Boot Services) -* To improve dual-boot scenarios. Currently, multiple Linux installations tend - to fight over which boot loader becomes the primary one in possession of the - MBR, and only that one installation can then update the boot loader - configuration of it freely. Other Linux installs have to be manually - configured to never touch the MBR and instead install a chain-loaded boot - loader in their own partition headers. In this new scheme as all - installations share a loader directory no manual configuration has to take - place, and all participants implicitly cooperate due to removal of name - collisions and can install/remove their own boot menu entries at free will, - without interfering with the entries of other installed operating systems. -* Drop-in directories are otherwise now pretty ubiquitous on Linux as an easy - way to extend configuration without having to edit, regenerate or manipulate - configuration files. For the sake of uniformity, we should do the same for - extending the boot menu. -* Userspace code can sanely parse boot loader configuration which is essential - with modern BIOSes which do not necessarily initialize USB keyboards anymore - during boot, which makes boot menus hard to reach for the user. If userspace - code can parse the boot loader configuration, too, this allows for UIs that - can select a boot menu item to boot into, before rebooting the machine, thus - not requiring interactivity during early boot. -* To unify and thus simplify configuration of the various boot loaders around, - which makes configuration of the boot loading process easier for users, - administrators and developers alike. -* For boot loaders with configuration _scripts_ such as grub2, adopting this - spec allows for mostly static scripts that are generated only once at first - installation, but then do not need to be updated anymore as that is done via - drop-in files exclusively. +* OS installer developers, to create appropriate partitions and set up the + initial boot loader configuration +* Distribution developers, to create appropriate configuration snippets when + installing or updating kernel packages +* UI developers, to implement user interfaces that list and select among the + available boot options -## Why not simply rely on the EFI boot menu logic? +## The boot partition -EFI is not ubiquitous, especially not in embedded systems. If you have an EFI -system, it provides a boot options logic that can offer similar -functionality. Here's why we think that it is not enough for our uses: +Everything described below is located on one or two partitions. The boot loader +or user-space programs reading the boot loader configuration should locate them +in the following manner: -* The various EFI implementations implement the boot order/boot item logic to - different levels. Some firmware implementations do not offer a boot menu at - all and instead unconditionally follow the EFI boot order, booting the first - item that is working. -* If the firmware setup is used to reset all data usually all EFI boot entries - are lost, making the system entirely unbootable, as the firmware setups - generally do not offer a UI to define additional boot items. By placing the - menu item information on disk, it is always available, regardless if the BIOS - setup data is lost. -* Harddisk images should be movable between machines and be bootable without - requiring explicit EFI variables to be set. This also requires that the list - of boot options is defined on disk, and not in EFI variables alone. -* EFI is not universal yet (especially on non-x86 platforms), this - specification is useful both for EFI and non-EFI boot loaders. -* Many EFI systems disable USB support during early boot to optimize boot - times, thus making keyboard input unavailable in the EFI menu. It is thus - useful if the OS UI has a standardized way to discover available boot options - which can be booted to. - -## Technical Details +* On disks with an MBR partition table: -Everything described below is located on a placeholder file system `$BOOT`. The -installer program should pick `$BOOT` according to the following rules: + * The boot partition — partition with the type ID of 0xEA — shall be used + for boot loader configuration and entries. -* On disks with an MBR partition table: - * If the OS is installed on a disk with an MBR partition table, and a - partition with the type id of 0xEA already exists it should be used as - `$BOOT`. - * Otherwise, if the OS is installed on a disk with an MBR partition table, a - new partition with type id of 0xEA shall be created, of a suitable size - (let's say 500MB), and it should be used as `$BOOT`. * On disks with GPT (GUID Partition Table) - * If the OS is installed on a disk with GPT, and an Extended Boot Loader - Partition (or XBOOTLDR partition for short), i.e. a partition with GPT type - GUID of `bc13c2ff-59e6-4262-a352-b275fd6f7172`, already exists, it should - be used as `$BOOT`. - * Otherwise, if the OS is installed on a disk with GPT, and an EFI System - Partition (or ESP for short), i.e. a partition with GPT type UID of - `c12a7328-f81f-11d2-ba4b-00a0c93ec93b` already exists and is large enough - (let's say 250MB) and otherwise qualifies, it should be used as `$BOOT`. - * Otherwise, if the OS is installed on a disk with GPT, and if the ESP - already exists but is too small, a new suitably sized (let's say 500MB) - XBOOTLDR partition shall be created and used as `$BOOT`. - * Otherwise, if the OS is installed on a disk with GPT, and no ESP exists - yet, a new suitably sized (let's say 500MB) ESP should be created and used - as `$BOOT`. - -This placeholder file system shall be determined during _installation time_, -and an fstab entry may be created. It should be mounted to either `/boot/` or -`/efi/`. Additional locations like `/boot/efi/` (with `/boot/` being a separate -file system) might be supported by implementations. This is not recommended -because the mounting of `$BOOT` is then dependent on and requires the mounting -of the intermediate file system. - -**Note:** _`$BOOT` should be considered **shared** among all OS installations -of a system. Instead of maintaining one `$BOOT` per installed OS (as `/boot/` -was traditionally handled), all installed OS share the same place to drop in -their boot-time configuration._ - -For systems where the firmware is able to read file systems directly, `$BOOT` -must be a file system readable by the firmware. For other systems and generic -installation and live media, `$BOOT` must be a VFAT (16 or 32) file -system. Applications accessing `$BOOT` should hence not assume that fancier -file system features such as symlinks, hardlinks, access control or case -sensitivity are supported. + + * The EFI System Partition (ESP for short) — a partition with GPT type GUID + of `c12a7328-f81f-11d2-ba4b-00a0c93ec93b` — should be used for boot loader + configuration and boot entries. + + * Optionally, an Extended Boot Loader Partition (XBOOTLDR partition for + short) — a partition with GPT type GUID of + `bc13c2ff-59e6-4262-a352-b275fd6f7172` — may be used as an additional + location for boot loader entries. This partition must be located on the + same disk as the ESP. + +In the text below, `$BOOT` will be used to refer to (the root of) the first of +the two partitions (the boot partition on MBR disks and the ESP on GPT disks), +and `$XBOOTLDR` will be used to refer to (the root of) the optional second +partition. + +An installer for the operating system should use this logic when selecting or +creating partitions: + + * If `$BOOT` is not found, a new suitably sized partition (let's say 500MB) + should be created, matching the characteristics described above. On disks + with GPT, only the ESP partition without the XBOOTLDR partition should be + created. + + * If the OS is installed on a disk with GPT and the ESP partition is found + but is too small, a new suitably sized (let's say 500MB) XBOOTLDR partition + shall be created. + +Those file systems shall be determined during _installation time_, and an fstab +entry may be created. If only one partition is used, it should be mounted on +`/boot/`. If both XBOOTLDR partition and the ESP are used, they should be +mounted on `/boot` and `/efi`, or on `/boot` and `/boot/efi`. + +**Note:** _Those file systems are **shared** among all OS installations on the +system. Instead of maintaining one boot partition per installed OS (as `/boot/` +was traditionally handled), all installed OSes use the same place for boot-time +configuration._ + +For systems where the firmware is able to read file systems directly, the ESP +must — and the XBOOTLDR partition should — be a file system readable by the +firmware. For most systems this means VFAT (16 or 32 bit). Applications +accessing both partitions should hence not assume that fancier file system +features such as symlinks, hardlinks, access control or case sensitivity are +supported. + +## Boot loader entries This specification defines two types of boot loader entries. The first type is -text based, very simple and suitable for a variety of firmware, architecture +text based, very simple, and suitable for a variety of firmware, architecture and image types ("Type #1"). The second type is specific to EFI, but allows single-file images that embed all metadata in the kernel binary itself, which is useful to cryptographically sign them as one file for the purpose of @@ -157,132 +108,151 @@ from the user. Only entries matching the feature set of boot loader and system shall be considered and displayed. This allows image builders to put together images that transparently support multiple different architectures. -Note that the `$BOOT` partition is not supposed to be exclusive territory of +Note that the boot partitions are not supposed to be the exclusive territory of this specification. This specification only defines semantics of the `/loader/` directory inside the file system (see below), but it doesn't intend to define -ownership of the whole file system exclusively. Boot loaders, firmware, and -other software implementing this specification may choose to place other -files and directories in the same file system. For example, boot loaders that -implement this specification might install their own boot code into the `$BOOT` -partition. On systems where `$BOOT` is the ESP this is a particularly common -setup. Implementations of this specification must be able to operate correctly -if files or directories other than `/loader/` are found in the top level -directory. Implementations that add their own files or directories to the file -systems should use well-named directories, to make name collisions between -multiple users of the file system unlikely. +ownership of the whole file system. Boot loaders, firmware, and other software +implementing this specification may choose to place other files and directories +in the same file system. For example, boot loaders that implement this +specification might install their own boot code on the same partition; this is +particularly common in the case of the ESP. Implementations of this specification +must be able to operate correctly if files or directories other than `/loader/` +are found in the top level directory. Implementations that add their own files +or directories to the file systems should use well-named directories, to make +name collisions between multiple users of the file system unlikely. ### Type #1 Boot Loader Specification Entries -We define two directories below `$BOOT`: - -* `$BOOT/loader/` is the directory containing all files needed for Type #1 - entries - -* `$BOOT/loader/entries/` is the directory containing the drop-in - snippets. This directory contains one `.conf` file for each boot menu item. +`$ESP/loader/` is the main directory containing the configuration for the boot +loader. **Note:** _In all cases the `/loader/` directory should be located directly in -the root of the file system. Specifically, if `$BOOT` is the ESP, then -`/loader/` directory should be located directly in the root directory of the -ESP, and not in the `/EFI/` subdirectory._ - -Inside the `$BOOT/loader/entries/` directory each OS vendor may drop one or -more configuration snippets with the suffix ".conf", one for each boot menu -item. The file name of the file is used for identification of the boot item but -shall never be presented to the user in the UI. The file name may be chosen -freely but should be unique enough to avoid clashes between OS -installations. More specifically it is suggested to include the machine ID -(`/etc/machine-id` or the D-Bus machine ID for OSes that lack -`/etc/machine-id`), the kernel version (as returned by `uname -r`) and an OS -identifier (The ID field of `/etc/os-release`). Example: -`$BOOT/loader/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf`. +the root of the file system. Specifically, the `/loader/` directory should +**not** be located under the `/EFI/` subdirectory on the ESP._ + +`$BOOT/loader/entries/` and `$XBOOTLDR/loader/entries/` are the directories +containing the drop-in snippets defining boot entries, one `.conf` file for +each boot menu item. Each OS may provide one or more such entries. The boot +loader should enumerate both directories and provide a merged list. + +The file name is used for identification of the boot item but shall never be +presented to the user in the UI. The file name may be chosen freely but should +be unique enough to avoid clashes between OS installations. More specifically, +it is suggested to include the `entry-token` (see +[kernel-install](https://www.freedesktop.org/software/systemd/man/kernel-install.html)) +or machine ID (see +[/etc/machine-id](https://www.freedesktop.org/software/systemd/man/machine-id.html)), +and the kernel version (as returned by `uname -r`, including the OS +identifier), so that the whole filename is +`$BOOT/loader/entries/<entry-token-or-machine-id>-<version>.conf`. + +Example: `$BOOT/loader/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf`. In order to maximize compatibility with file system implementations and restricted boot loader environments, and to minimize conflicting character use with other programs, file names shall be chosen from a restricted character -set: ASCII upper and lower case characters, digits, "+", "-", "_" and -".". Also, the file names should have a length of at least one and at most 255 -characters (including file name suffix). - -These configuration snippets shall be Unix-style text files (i.e. line -separation with a single newline character), in the UTF-8 encoding. The -configuration snippets are loosely inspired on Grub1's configuration -syntax. Lines beginning with '#' shall be ignored and used for commenting. The -first word of a line is used as key and shall be separated by one or more -spaces from its value. The following keys are known: - -* `title` shall contain a human readable title string for this menu item. This - will be displayed in the boot menu for the item. It is a good idea to - initialize this from the `PRETTY_NAME` of `/etc/os-release`. This name should - be descriptive and does not have to be unique. If a boot loader discovers two - entries with the same title it is a good idea to show more than just the raw - title in the UI, for example by appending the `version` field. This field is - optional. Example: "Fedora 18 (Spherical Cow)". -* `version` shall contain a human readable version string for this menu - item. This is usually the kernel version and is intended for use by OSes to - install multiple kernel versions at the same time with the same `title` - field. This field shall be in a syntax that is useful for Debian-style - version sorts, so that the boot loader UI can determine the newest version - easily and show it first or preselect it automatically. This field is - optional. Example: `3.7.2-201.fc18.x86_64`. -* `machine-id` shall contain the machine ID of the OS `/etc/machine-id`. This - is useful for boot loaders and applications to filter out boot entries, for - example to show only a single newest kernel per OS, or to group items by OS, - or to maybe filter out the currently booted OS in UIs that want to show only - other installed operating systems. This ID shall be formatted as 32 lower - case hexadecimal characters (i.e. without any UUID formatting). This key is - optional. Example: `4098b3f648d74c13b1f04ccfba7798e8`. -* `sort-key` shall contain a short string used for sorting entries on - display. This can be defined freely though should typically be initialized - from `IMAGE_ID=` or `ID=` from `/etc/os-release` of the relevant entry, - possibly suffixed. This field is optional. If set, it is used as primary - sorting key for the entries on display (lexicographically increasing). It - does not have to be unique (and usually is not). If non-unique the the - `machine-id` (lexicographically increasing) and `version` (lexicographically - decreasing, i.e. newest version first) fields described above are used as - secondary/ternary sorting keys. If this field is not set entries are - typically sorted by the `.conf` file name of the entry. -* `linux` refers to the Linux kernel to spawn and shall be a path relative to - `$BOOT`. It is recommended that every distribution creates a machine id and - version specific subdirectory below `$BOOT` and places its kernels and - initial RAM disk images there. Example: - `/6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/linux`. -* `initrd` refers to the initrd to use when executing the kernel. This also - shall be a path relative to `$BOOT`. This key is optional. This key may - appear more than once in which case all specified images are used, in the - order they are listed. Example: - `6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/initrd`. -* `efi` refers to an arbitrary EFI program. This also takes a path relative to - `$BOOT`. If this key is set, and the system is not an EFI system this entry - should be hidden. +set: ASCII upper and lower case characters, digits, "+", "-", "_" and ".". +Also, the file names should have a length of at least one and at most 255 +characters (including the file name suffix). + +These configuration snippets shall be UNIX-style text files (i.e. lines +separated by a single newline character), in the UTF-8 encoding. The +configuration snippets are loosely inspired by Grub1's configuration syntax. +Lines beginning with "#" are used for comments and shall be ignored. The first +word of a line is used as key and is separated by one or more spaces from the +value. + +#### Type #1 Boot Loader Entry Keys + +The following keys are recognized: + +* `title` is a human-readable title for this menu item to be displayed in the + boot menu. It is a good idea to initialize this from the `PRETTY_NAME=` of + [os-release](https://www.freedesktop.org/software/systemd/man/os-release.html). + This name should be descriptive and does not have to be unique. If a boot + loader discovers two entries with the same title it should show more than + just the raw title in the UI, for example by appending the `version` + field. This field is optional. + + Example: `title Fedora 18 (Spherical Cow)` + +* `version` is a human-readable version for this menu item. This is usually the + kernel version and is intended for use by OSes to install multiple kernel + versions with the same `title` field. This field is used for sorting entries, + so that the boot loader can order entries by age or select the newest one + automatically. This field is optional. + + See [Sorting](#sorting) below. + + Example: `version 3.7.2-201.fc18.x86_64` + +* `machine-id` is the machine ID of the OS. This can be used by boot loaders + and applications to filter out boot entries, for example to show only a + single newest kernel per OS, to group items by OS, or to filter out the + currently booted OS when showing only other installed operating systems. + This ID shall be formatted as 32 lower case hexadecimal characters + (i.e. without any UUID formatting). This key is optional. + + Example: `machine-id 4098b3f648d74c13b1f04ccfba7798e8` + +* `sort-key` is a short string used for sorting entries on display. This should + typically be initialized from the `IMAGE_ID=` or `ID=` fields of + [os-release](https://www.freedesktop.org/software/systemd/man/os-release.html), + possibly with an additional suffix. This field is optional. + + Example: `sort-key fedora` + +* `linux` is the Linux kernel to spawn and as a path relative to file system + root. It is recommended that every distribution creates a machine id and + version specific subdirectory and places its kernels and initial RAM disk + images there. + + Example: `linux /6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/linux` + +* `initrd` is the initrd to use when executing the kernel. This key is + optional. This key may appear more than once in which case all specified + images are used, in the order they are listed. + + Example: `initrd 6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/initrd` + +* `efi` refers to an arbitrary EFI program. If this key is set, and the system + is not an EFI system, this entry should be hidden. + * `options` shall contain kernel parameters to pass to the Linux kernel to spawn. This key is optional and may appear more than once in which case all specified parameters are used in the order they are listed. + + Example: `options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2 quiet` + * `devicetree` refers to the binary device tree to use when executing the - kernel. This also shall be a path relative to `$BOOT`. This key is - optional. Example: - `6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.armv7hl/tegra20-paz00.dtb`. + kernel. This key is optional. + + Example: `devicetree 6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.armv7hl/tegra20-paz00.dtb` + * `devicetree-overlay` refers to a list of device tree overlays that should be applied by the boot loader. Multiple overlays are separated by spaces and applied in the same order as they are listed. This key is optional but - depends on the `devicetree` key. Example: - `/6a9857a393724b7a981ebb5b8495b9ea/overlays/overlay_A.dtbo - /6a9857a393724b7a981ebb5b8495b9ea/overlays/overlay_B.dtbo` -* `architecture` refers to the architecture this entry is defined for. The - argument should be an architecture identifier, using the architecture - vocabulary defined by the EFI specification (i.e. `IA32`, `x64`, `IA64`, - `ARM`, `AA64`, …). If specified and this does not match (case insensitively) - the local system architecture this entry should be hidden. + depends on the `devicetree` key. + + Example: `devicetree-overlay /6a9857a393724b7a981ebb5b8495b9ea/overlays/overlay_A.dtbo /6a9857a393724b7a981ebb5b8495b9ea/overlays/overlay_B.dtbo` + +* `architecture` refers to the architecture this entry is for. The argument + should be an architecture identifier, using the architecture vocabulary + defined by the EFI specification (i.e. `IA32`, `x64`, `IA64`, `ARM`, `AA64`, + …). If specified and it does not match the local system architecture this + entry should be hidden. The comparison should be done case-insensitively. + + Example: `architecture aa64` Each configuration drop-in snippet must include at least a `linux` or an `efi` -key and is otherwise not valid. Here's an example for a complete drop-in file: +key. Here is an example for a complete drop-in file: # /boot/loader/entries/6a9857a393724b7a981ebb5b8495b9ea-3.8.0-2.fc19.x86_64.conf title Fedora 19 (Rawhide) sort-key fedora machine-id 6a9857a393724b7a981ebb5b8495b9ea version 3.8.0-2.fc19.x86_64 - options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2 + options root=UUID=6d3376e4-fc93-4509-95ec-a21d68011da2 quiet architecture x64 linux /6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/linux initrd /6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/initrd @@ -298,28 +268,40 @@ i.e. it is a good idea that both images shipped as UEFI PE images and those which are not don't make unnecessary assumption on the underlying firmware, i.e. don't hard depend on legacy BIOS calls or UEFI boot services. -Note that these configuration snippets may only reference kernels (and EFI -programs) that reside on the same file system as the configuration snippets, -i.e. everything referenced must be contained in the same file system. This is -by design, as referencing other partitions or devices would require a -non-trivial language for denoting device paths. If kernels/initrds are to be -read from other partitions/disks the boot loader can do this in its own native -configuration, using its own specific device path language, and this is out of -focus for this specification. More specifically, on non-EFI systems -configuration snippets following this specification cannot be used to spawn -other operating systems (such as Windows). +When Type #1 configuration snippets refer to other files (for `linux`, +`initrd`, `efi`, `devicetree`, and `devicetree-overlay`), those files must be +located on the same partition, and the paths must be absolute paths relative to +the root of that file system. The naming of those files can be chosen by the +installer. A recommended scheme is described in the next section. + +### Recommended Directory Layout for Additional Files + +It is recommened to place the kernel and other other files comprising a single +boot loader entry in a separate directory: +`/<entry-token-or-machine-id>/<version>/`. This naming scheme uses the same +elements as the boot loader configuration snippet, providing the same level of +uniqueness. + +Example: `$BOOT/6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/linux` + `$BOOT/6a9857a393724b7a981ebb5b8495b9ea/3.8.0-2.fc19.x86_64/initrd` + +Other naming schemes are possible. In particular, traditionally a flat naming +scheme with files in the root directory was used. This is not recommended +because it is hard to avoid conflicts in a multi-boot installation. + +### Standard-conformance Marker File Unfortunately, there are implementations of boot loading infrastructure that -are also using the /loader/entries/ directory, but place files in them that are -not valid by this specification. In order to minimize confusion a boot loader -implementation may place a file /loader/entries.srel next to the -/loader/entries/ directory containing the ASCII string "type1" (suffixed -with a UNIX newline). Tools that need to determine whether an existing -directory implements the semantics described here may check for this file and -contents: if it exists and contains the mentioned string, it shall assume a -standards compliant implementation is in place. If it exists but contains a -different string it shall assume non-standard semantics are implemented. If the -file does not exist no assumptions should be made. +are also using the `/loader/entries/` directory, but installing files that do +not follow this specification. In order to minimize confusion, a boot loader +implementation may place the file `/loader/entries.srel` next to the +`/loader/entries/` directory containing the ASCII string `type1` (followed by a +UNIX newline). Tools that need to determine whether an existing directory +implements the semantics described here may check for this file and contents: +if it exists and contains the mentioned string, it shall assume a +standards-compliant implementation is in place. If it exists but contains a +different string it shall assume other semantics are implemented. If the file +does not exist, no assumptions should be made. ### Type #2 EFI Unified Kernel Images @@ -327,31 +309,31 @@ A unified kernel image is a single EFI PE executable combining an EFI stub loader, a kernel image, an initramfs image, and the kernel command line. See the description of the `--uefi` option in [dracut(8)](http://man7.org/linux/man-pages/man8/dracut.8.html). Such unified -images will be searched for under `$BOOT/EFI/Linux/` and must have the -extension `.efi`. Support for images of this type is of course specific to -systems with EFI firmware. Ignore this section if you work on systems not -supporting EFI. +images are installed in the`$BOOT/EFI/Linux/` and `$XBOOTLDR/EFI/Linux/` +directories and must have the extension `.efi`. +Support for images of this type is of course specific to systems with EFI +firmware. Ignore this section if you work on systems not supporting EFI. Type #2 file names should be chosen from the same restricted character set as -Type #1 described above (but use a different file name suffix of `.efi` instead -of `.conf`). +Type #1 described above (but with the file name suffix of `.efi` instead of +`.conf`). Images of this type have the advantage that all metadata and payload that makes -up the boot entry is monopolized in a single PE file that can be signed +up the boot entry is contained in a single PE file that can be signed cryptographically as one for the purpose of EFI SecureBoot. A valid unified kernel image must contain two PE sections: -* `.cmdline` section with the kernel command line +* `.cmdline` section with the kernel command line, * `.osrel` section with an embedded copy of the [os-release](https://www.freedesktop.org/software/systemd/man/os-release.html) - file describing the image + file describing the image. -The `PRETTY_NAME=` and `VERSION_ID=` fields in the embedded os-release file are -used the same as `title` and `version` in the "boot loader specification" -entries. The `.cmdline` section is used instead of the `options` field. `linux` -and `initrd` fields are not necessary, and there is no counterpart for the -`machine-id` field. +The `PRETTY_NAME=` and `VERSION_ID=` fields in the embedded `os-release` file +are used the same as `title` and `version` in the Type #1 entries. The +`.cmdline` section is used instead of the `options` field. `linux` and `initrd` +fields are not necessary, and there is no counterpart for the `machine-id` +field. On EFI, any such images shall be added to the list of valid boot entries. @@ -374,43 +356,225 @@ path separator. This needs to be converted to an EFI-style "\\" separator in EFI boot loaders. -## Logic +## Locating boot entries -A _boot loader_ needs a file system driver to discover and read `$BOOT`, then -simply reads all files `$BOOT/loader/entries/*.conf`, and populates its boot -menu with this. On EFI, it then extends this with any unified kernel images -found in `$BOOT/EFI/Linux/*.efi`. It may also add additional entries, for -example a "Reboot into firmware" option. Optionally it may sort the menu based -on the `sort-key`, `machine-id` and `version` fields, and possibly others. It -uses the file name to identify specific items, for example in case it supports -storing away default entry information somewhere. A boot loader should -generally not modify these files. +A _boot loader_ locates `$BOOT` and `$XBOOTLDR`, then simply reads all the +files `$BOOT/loader/entries/*.conf` and `$XBOOTLDR/loader/entries/*.conf`, and +populates its boot menu. On EFI, it then extends this with any unified kernel +images found in `$BOOT/EFI/Linux/*.efi` and `$XBOOTLDR/EFI/Linux/*.efi`. It may +also add additional entries, for example a "Reboot into firmware" option. +Optionally it may sort the menu based on the `sort-key`, `machine-id` and +`version` fields, and possibly others. It uses the file name to identify +specific items, for example in case it supports storing away default entry +information somewhere. A boot loader should generally not modify these files. For "Boot Loader Specification Entries" (Type #1), the _kernel package -installer_ installs the kernel and initrd images to `$BOOT` (it is recommended -to place these files in a vendor and OS and installation specific directory) -and then generates a configuration snippet for it, placing this in -`$BOOT/loader/entries/xyz.conf`, with xyz as concatenation of machine id and -version information (see above). The files created by a kernel package are -private property of the kernel package and should be removed along with it. +installer_ installs the kernel and initrd images to `$XBOOTLDR` (if used) or +`$BOOT`. It is recommended to place these files in a vendor and OS and +installation specific directory. It then generates a configuration snippet, +placing it in `$BOOT/loader/entries/xyz.conf`, with "xyz" as concatenation of +machine id and version information (see above). The files created by a kernel +package are tied to the kernel package and should be removed along with it. For "EFI Unified Kernel Images" (Type #2), the vendor or kernel package -installer creates the combined image and drops it into `$BOOT/EFI/Linux/`. This -file is also private property of the kernel package and should be removed along -with it. +installer should create the combined image and drop it into +`$BOOT/EFI/Linux/`. This file is also tied to the kernel package and should be +removed along with it. A _UI application_ intended to show available boot options shall operate -similar to a boot loader, but might apply additional filters, for example by -filtering out the booted OS via the machine ID, or by suppressing all but the +similarly to a boot loader, but might apply additional filters, for example by +filtering the booted OS via the machine ID, or by suppressing all but the newest kernel versions. An _OS installer_ picks the right place for `$BOOT` as defined above (possibly -creating a partition and file system for it) and pre-creates the -`/loader/entries/` directory in it. It then installs an appropriate boot loader -that can read these snippets. Finally, it installs one or more kernel packages. +creating a partition and file system for it) and creates the `/loader/entries/` +directory in it. It then installs an appropriate boot loader that can read +these snippets. Finally, it installs one or more kernel packages. + +## Sorting + +The boot loader menu should generally show entries in some order meaningful to +the user. The `title` key is free-form and not suitable to be used as the +primary sorting key. Instead, the boot loader should use the following rules: +if `sort-key` is set on both entries, use in order of priority, +the `sort-key` (A-Z, increasing [alphanumerical order](#alphanumerical-order)), +`machine-id` (A-Z, increasing alphanumerical order), +and `version` keys (decreasing [version order](#version-order)). +If `sort-key` is set on one entry, it sorts earlier. +At the end, if necessary, when `sort-key` is not set or those fields are not +set or are all equal, the boot loader should sort using the file name of the +entry (decreasing version sort), with the suffix removed. + +**Note:** _This description assumes that the boot loader shows entries in a +traditional menu, with newest and "best" entries at the top, thus entries with +a higher version number are sorter *earlier*. The boot loader is free to +use a different direction (or none at all) during display._ + +### Alphanumerical order + +Free-form strings and machine IDs should be compared using a method equivalent +to [strcmp(3)](https://man7.org/linux/man-pages/man3/strcmp.3.html) on their +UTF-8 represenations. If just one of the strings is unspecified or empty, it +compares lower. If both strings are unspecified or empty, they compare equal. + +### Version order + +The following method should be used to compare version strings. The algorithm +is based on rpm's `rpmvercmp()`, but not identical. + +ASCII letters (`a-z`, `A-Z`) and digits (`0-9`) form alphanumerical components of the version. +Minus (`-`) separates the version and release parts. +Dot (`.`) separates parts of version or release. +Tilde (`~`) is a prefix that always compares lower. +Caret (`^`) is a prefix that always compares higher. + +Both strings are compared from the beginning until the end, or until the +strings are found to compare as different. In a loop: +1. Any characters which are outside of the set of listed above (`a-z`, `A-Z`, `0-9`, `-`, `.`, `~`, `^`) + are skipped in both strings. In particular, this means that non-ASCII characters + that are Unicode digits or letters are skipped too. +2. If one of the strings has ended: if the other string hasn't, the string that + has remaining characters compares higher. Otherwise, the strings compare + equal. +3. If the remaining part of one of strings starts with `~`: + if other remaining part does not start with `~`, + the string with `~` compares lower. Otherwise, both tilde characters are skipped. +4. The check from point 2. is repeated here. +5. If the remaining part of one of strings starts with `-`: + if the other remaining part does not start with `-`, + the string with `-` compares lower. Otherwise, both minus characters are skipped. +6. If the remaining part of one of strings starts with `^`: + if the other remaining part does not start with `^`, + the string with `^` compares higher. Otherwise, both caret characters are skipped. +6. If the remaining part of one of strings starts with `.`: + if the other remaining part does not start with `.`, + the string with `.` compares lower. Otherwise, both dot characters are skipped. +7. If either of the remaining parts starts with a digit, numerical prefixes are + compared numerically. Any leading zeroes are skipped. + The numerical prefixes (until the first non-digit character) are evaluated as numbers. + If one of the prefixes is empty, it evaluates as 0. + If the numbers are different, the string with the bigger number compares higher. + Otherwise, the comparison continues at the following characters at point 1. +8. Leading alphabetical prefixes are compared alphabetically. + The substrings are compared letter-by-letter. + If both letters are the same, the comparison continues with the next letter. + Capital letters compare lower than lower-case letters (`A < a`). + When the end of one substring has been reached (a non-letter character or the end + of the whole string), if the other substring has remaining letters, it compares higher. + Otherwise, the comparison continues at the following characters at point 1. + +Examples (with '' meaning the empty string): + +* `11 == 11` +* `systemd-123 == systemd-123` +* `bar-123 < foo-123` +* `123a > 123` +* `123.a > 123` +* `123.a < 123.b` +* `123a > 123.a` +* `11α == 11β` +* `A < a` +* '' < `0` +* `0.` > `0` +* `0.0` > `0` +* `0` < `~` +* '' < `~` + +Note: [systemd-analyze](https://www.freedesktop.org/software/systemd/man/systemd-analyze.html) +implements this version comparison algorithm as +``` +systemd-analyze compare-versions <version-a> <version-b> +``` + +## Additional discussion + +### Why is there a need for this specification? + +This specification brings the following advantages: + +* Installation of new boot entries is more robust, as no explicit rewriting of + configuration files is required. + +* It allows an out-of-the-box boot experience on any platform without the need + of traditional firmware mechanisms (e.g. BIOS calls, UEFI Boot Services). + +* It improves dual-boot scenarios. Without cooperation, multiple Linux + installations tend to fight over which boot loader becomes the primary one in + possession of the MBR or the boot partition, and only that one installation + can then update the boot loader configuration. Other Linux installs have to + be manually configured to never touch the MBR and instead install a + chain-loaded boot loader in their own partition headers. In this new scheme + all installations share a loader directory and no manual configuration has to + take place. All participants implicitly cooperate due to removal of name + collisions and can install/remove their own boot menu entries without + interfering with the entries of other installed operating systems. + +* Drop-in directories are now pretty ubiquitous on Linux as an easy way to + extend configuration without having to edit, regenerate or manipulate + configuration files. For the sake of uniformity, we should do the same for + the boot menu. + +* Userspace code can sanely parse boot loader configuration which is essential + with modern firmware which does not necessarily initialize USB keyboards + during boot, which makes boot menus hard to reach for the user. If userspace + code can parse the boot loader configuration too, UI can be written that + select a boot menu item to boot into before rebooting the machine, thus not + requiring interactivity during early boot. + +* To unify and thus simplify configuration of the various boot loaders, which + makes configuration of the boot loading process easier for users, + administrators, and developers alike. + +* For boot loaders with configuration _scripts_ such as grub2, adopting this + spec allows for mostly static scripts that are generated only once at first + installation, but then do not need to be updated anymore as that is done via + drop-in files exclusively. +### Why not simply rely on the EFI boot menu logic? -## Out of Focus +EFI is not ubiquitous, especially not in embedded systems. But even on systems +with EFI, which provides a boot options logic that can offer similar +functionality, this specfication is still needed for the following reasons: + +* The various EFI implementations implement the boot order/boot item logic to + different levels. Some firmware implementations do not offer a boot menu at + all and instead unconditionally follow the EFI boot order, booting the first + item that is working. + +* If the firmware setup is used to reset data, usually all EFI boot entries + are lost, making the system entirely unbootable, as the firmware setups + generally do not offer a UI to define additional boot items. By placing the + menu item information on disk, it is always available, even if the firmware + configuration is lost. + +* Harddisk images should be movable between machines and be bootable without + requiring firmare configuration. This also requires that the list + of boot options is defined on disk, and not in EFI variables alone. + +* EFI is not universal yet (especially on non-x86 platforms), this + specification is useful both for EFI and non-EFI boot loaders. + +* Many EFI systems disable USB support during early boot to optimize boot + times, thus making keyboard input unavailable in the EFI menu. It is thus + useful if the OS UI has a standardized way to discover available boot options + which can be booted to. + +### Why is the version comparsion logic so complicated? + +The `sort-key` allows us to group entries by "operating system", e.g. all +versions of Fedora together, no matter if they identify themselves as "Fedora +Workstation" or "Fedora Rawhide (prerelease)". The `sort-key` was introduced +only recently, so we need to provide a meaningful order for entries both with +and without it. Since it is a new concept, it is assumed that entries with +`sort-key` are newer. + +In a traditional menu with entries displayed vertically, we want names to be +sorter alpabetically (CentOS, Debian, Fedora, OpenSUSE, …), it would be strange +to have them in reverse order. But when multiple kernels are available for the +same installation, we want to display the latest kernel with highest priority, +i.e. earlier in the list. + +### Out of Focus There are a couple of items that are out of focus for this specification: @@ -419,6 +583,7 @@ There are a couple of items that are out of focus for this specification: communicate to the boot loader the default boot loader entry temporarily or persistently. Defining a common scheme for this is certainly a good idea, but out of focus for this specification. + * This specification is just about "Free" Operating systems. Hooking in other operating systems (like Windows and macOS) into the boot menu is a different story and should probably happen outside of this specification. For example, @@ -426,6 +591,7 @@ There are a couple of items that are out of focus for this specification: runtime without explicit configuration (like `systemd-boot` does it), or via native configuration (for example via explicit Grub2 configuration generated once at installation). + * This specification leaves undefined what to do about systems which are upgraded from an OS that does not implement this specification. As the previous boot loader logic was largely handled by in distribution-specific @@ -434,6 +600,13 @@ There are a couple of items that are out of focus for this specification: with the old scheme for old installations and use this new scheme only for new installations. +* Referencing kernels or initrds on other partitions other than the partition + containing the Type #1 boot loader entry. This is by design, as specifying + other partitions or devices would require a non-trivial language for denoting + device paths. In particular this means that on non-EFI systems configuration + snippets following this specification cannot be used to spawn other operating + systems (such as Windows). + ## Links diff --git a/docs/HACKING.md b/docs/HACKING.md index 0151b9c4f4..9e5313e07a 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -173,6 +173,9 @@ for sanitizer in address undefined memory; do done done +./infra/helper.py build_fuzzers --clean --architecture i386 systemd "$path_to_systemd" +./infra/helper.py check_build --architecture i386 -e ALLOWED_BROKEN_TARGETS_PERCENTAGE=0 systemd + ./infra/helper.py build_fuzzers --clean --sanitizer coverage systemd "$path_to_systemd" ./infra/helper.py coverage --no-corpus-download systemd ``` diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb index 2e4f6f4293..7204e4ea2a 100644 --- a/hwdb.d/60-keyboard.hwdb +++ b/hwdb.d/60-keyboard.hwdb @@ -515,8 +515,9 @@ evdev:input:b0003v0458p0708* # Google ########################################################### -# Google Hangouts Meet speakermic +# Google Hangouts Meet speakermic and Google Meet speakermic evdev:input:b0003v18D1p8001* +evdev:input:b0003v18D1p8007* KEYBOARD_KEY_b002f=reserved # Disable micmute key ########################################################### diff --git a/man/homectl.xml b/man/homectl.xml index dacbd17b1e..6fd5340370 100644 --- a/man/homectl.xml +++ b/man/homectl.xml @@ -686,7 +686,7 @@ <varlistentry> <term><option>--luks-cipher=</option><replaceable>CIPHER</replaceable></term> <term><option>--luks-cipher-mode=</option><replaceable>MODE</replaceable></term> - <term><option>--luks-volume-key-size=</option><replaceable>BITS</replaceable></term> + <term><option>--luks-volume-key-size=</option><replaceable>BYTES</replaceable></term> <term><option>--luks-pbkdf-type=</option><replaceable>TYPE</replaceable></term> <term><option>--luks-pbkdf-hash-algorithm=</option><replaceable>ALGORITHM</replaceable></term> <term><option>--luks-pbkdf-time-cost=</option><replaceable>SECONDS</replaceable></term> @@ -696,7 +696,12 @@ <listitem><para>Configures various cryptographic parameters for the LUKS2 storage mechanism. See <citerefentry project='man-pages'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry> - for details on the specific attributes.</para></listitem> + for details on the specific attributes.</para> + + <para>Note that <command>homectl</command> uses bytes for key size, like + <filename>/proc/crypto</filename>, but <citerefentry + project='man-pages'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry> + uses bits.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/loader.conf.xml b/man/loader.conf.xml index acd748ad28..509412ec9d 100644 --- a/man/loader.conf.xml +++ b/man/loader.conf.xml @@ -121,7 +121,7 @@ will be stored as an EFI variable in that case, overriding this option. </para> - <para>If set to <literal>menu-hidden</literal> or <literal>0</literal> no menu + <para>If set to <literal>menu-hidden</literal> or <literal>0</literal> (the default) no menu is shown and the default entry will be booted immediately. The menu can be shown by pressing and holding a key before systemd-boot is launched. Setting this to <literal>menu-force</literal> disables the timeout while always showing the menu.</para> diff --git a/man/sd_bus_error-example.c b/man/sd_bus_error-example.c new file mode 100644 index 0000000000..abea13ca45 --- /dev/null +++ b/man/sd_bus_error-example.c @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: CC0-1.0 */ + +#include <errno.h> +#include <string.h> +#include <unistd.h> +#include <sd-bus.h> + +int writer_with_negative_errno_return(int fd, sd_bus_error *error) { + const char *message = "Hello, World!\n"; + + ssize_t n = write(fd, message, strlen(message)); + if (n >= 0) + return n; /* On success, return the number of bytes written, possibly 0. */ + + /* On error, initialize the error structure, and also propagate the errno + * value that write(2) set for us. */ + return sd_bus_error_set_errnof(error, errno, "Failed to write to fd %i: %m", fd); +} diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml index 5697ce7323..f4d0fea2e6 100644 --- a/man/sd_bus_error.xml +++ b/man/sd_bus_error.xml @@ -246,10 +246,15 @@ values in <parameter>e</parameter>, if <parameter>e</parameter> has been set with an error value before. Otherwise, it will return immediately. If the strings in <parameter>e</parameter> were set using <function>sd_bus_error_set_const()</function>, they will be shared. Otherwise, they will be - copied. Returns a converted <varname>errno</varname>-like, negative error code or <constant>0</constant>. - Before this call, <parameter>dst</parameter> must be unset, i.e. either freshly initialized with + copied. Before this call, <parameter>dst</parameter> must be unset, i.e. either freshly initialized with <constant>NULL</constant> or reset using <function>sd_bus_error_free()</function>.</para> + <para><function>sd_bus_error_copy()</function> generally returns <constant>0</constant> or a negative + <varname>errno</varname>-like value based on the input parameter <parameter>e</parameter>: + <constant>0</constant> if it was unset and a negative integer if it was set to some error, similarly to + <function>sd_bus_error_set()</function>. It may however also return an error generated internally, for + example <constant>-ENOMEM</constant> if a memory allocation fails.</para> + <para><function>sd_bus_error_move()</function> is similar to <function>sd_bus_error_copy()</function>, but will move any error information from <parameter>e</parameter> into <parameter>dst</parameter>, resetting the former. This function cannot fail, as no new memory is allocated. Note that if @@ -287,6 +292,18 @@ </refsect1> <refsect1> + <title>Reference ownership</title> + + <para><structname>sd_bus_error</structname> is not reference-counted. Users should destroy resources held + by it by calling <function>sd_bus_error_free()</function>. Usually, error structures are allocated on the + stack or passed in as function parameters, but they may also be allocated dynamically, in which case it + is the duty of the caller to <citerefentry + project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry> the memory + held by the structure itself after freeing its contents with + <function>sd_bus_error_free()</function>.</para> + </refsect1> + + <refsect1> <title>Return Value</title> <para>The functions <function>sd_bus_error_set()</function>, <function>sd_bus_error_setf()</function>, @@ -297,7 +314,8 @@ <function>sd_bus_error_set_errnofv()</function>, return <constant>0</constant> when the specified error value is <constant>0</constant>, and a negative errno-like value corresponding to the <parameter>error</parameter> parameter otherwise. If an error occurs internally, one of the negative - error values listed below will be returned.</para> + error values listed below will be returned. This allows those functions to be conveniently used in a + <constant>return</constant> statement, see the example below.</para> <para><function>sd_bus_error_get_errno()</function> returns <constant>false</constant> when <parameter>e</parameter> is @@ -305,7 +323,9 @@ <parameter>e->name</parameter> otherwise.</para> <para><function>sd_bus_error_copy()</function> and <function>sd_bus_error_move()</function> return a - negative error value converted from the source error, and zero if the error has not been set.</para> + negative error value converted from the source error, and zero if the error has not been set. This + allows those functions to be conveniently used in a <constant>return</constant> statement, see the + example below.</para> <para><function>sd_bus_error_is_set()</function> returns a non-zero value when <parameter>e</parameter> and the @@ -316,32 +336,18 @@ <function>sd_bus_error_has_names_sentinel()</function> return a non-zero value when <parameter>e</parameter> is non-<constant>NULL</constant> and the <structfield>name</structfield> field is equal to one of the given names, zero otherwise.</para> - </refsect1> - - <refsect1> - <title>Reference ownership</title> - <para><structname>sd_bus_error</structname> is not reference - counted. Users should destroy resources held by it by calling - <function>sd_bus_error_free()</function>. Usually, error structures - are allocated on the stack or passed in as function parameters, - but they may also be allocated dynamically, in which case it is - the duty of the caller to <citerefentry - project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry> - the memory held by the structure itself after freeing its contents - with <function>sd_bus_error_free()</function>.</para> <refsect2> <title>Errors</title> - <para>Returned errors may indicate the following problems:</para> + <para>Return value may indicate the following problems in the invocation of the function itself:</para> <variablelist> - <varlistentry> <term><constant>-EINVAL</constant></term> - <listitem><para>Error was already set in <structname>sd_bus_error</structname> structure when one - the error-setting functions was called.</para></listitem> + <listitem><para>Error was already set in the <structname>sd_bus_error</structname> structure when + one the error-setting functions was called.</para></listitem> </varlistentry> <varlistentry> @@ -350,9 +356,29 @@ <listitem><para>Memory allocation failed.</para></listitem> </varlistentry> </variablelist> + + <para>On success, <function>sd_bus_error_set()</function>, <function>sd_bus_error_setf()</function>, + <function>sd_bus_error_set_const()</function>, <function>sd_bus_error_set_errno()</function>, + <function>sd_bus_error_set_errnof()</function>, <function>sd_bus_error_set_errnofv()</function>, + <function>sd_bus_error_copy()</function>, and <function>sd_bus_error_move()</function> will return a + negative converted <varname>errno</varname>-style value, or <constant>0</constant> if the error + parameter is <constant>NULL</constant> or unset. D-Bus errors are converted to the integral + <varname>errno</varname>-style value, and the mapping mechanism is extensible, see the discussion + above. This effectively means that almost any negative <varname>errno</varname>-style value can be + returned.</para> </refsect2> </refsect1> + <refsect1> + <title>Examples</title> + + <example> + <title>Using the negative return value to propagate an error</title> + + <programlisting><xi:include href="sd_bus_error-example.c" parse="text" /></programlisting> + </example> + </refsect1> + <xi:include href="libsystemd-pkgconfig.xml" /> <refsect1> diff --git a/man/sd_hwdb_new.xml b/man/sd_hwdb_new.xml index c071599ae6..0584add423 100644 --- a/man/sd_hwdb_new.xml +++ b/man/sd_hwdb_new.xml @@ -16,6 +16,7 @@ <refnamediv> <refname>sd_hwdb_new</refname> + <refname>sd_hwdb_new_from_path</refname> <refname>sd_hwdb_ref</refname> <refname>sd_hwdb_unref</refname> @@ -32,6 +33,12 @@ </funcprototype> <funcprototype> + <funcdef>int <function>sd_hwdb_new_from_path</function></funcdef> + <paramdef>const char *<parameter>path</parameter></paramdef> + <paramdef>sd_hwdb **<parameter>hwdb</parameter></paramdef> + </funcprototype> + + <funcprototype> <funcdef>sd_hwdb* <function>sd_hwdb_ref</function></funcdef> <paramdef>sd_hwdb *<parameter>hwdb</parameter></paramdef> </funcprototype> @@ -50,6 +57,9 @@ database. Upon initialization, the file containing the binary representation of the hardware database is located and opened. The new object is returned in <parameter>hwdb</parameter>.</para> + <para><function>sd_hwdb_new_from_path()</function> may be used to specify the path from which the binary + hardware database should be opened.</para> + <para>The <parameter>hwdb</parameter> object is reference counted. <function>sd_hwdb_ref()</function> and <function>sd_hwdb_unref()</function> may be used to get a new reference or destroy an existing reference to an object. The caller must dispose of the reference acquired with <function>sd_hwdb_new()</function> @@ -65,8 +75,8 @@ <refsect1> <title>Return Value</title> - <para>On success, <function>sd_hwdb_new()</function> returns a non-negative integer. On - failure, it returns a negative errno-style error code.</para> + <para>On success, <function>sd_hwdb_new()</function> and <function>sd_hwdb_new_from_path()</function> + return a non-negative integer. On failure, a negative errno-style error code is returned.</para> <para><function>sd_hwdb_ref()</function> always returns the argument. </para> diff --git a/man/shutdown.xml b/man/shutdown.xml index b07736ee68..97f33e802a 100644 --- a/man/shutdown.xml +++ b/man/shutdown.xml @@ -18,7 +18,7 @@ <refnamediv> <refname>shutdown</refname> - <refpurpose>Halt, power-off or reboot the machine</refpurpose> + <refpurpose>Halt, power off or reboot the machine</refpurpose> </refnamediv> <refsynopsisdiv> @@ -33,8 +33,7 @@ <refsect1> <title>Description</title> - <para><command>shutdown</command> may be used to halt, power-off - or reboot the machine.</para> + <para><command>shutdown</command> may be used to halt, power off, or reboot the machine.</para> <para>The first argument may be a time string (which is usually <literal>now</literal>). Optionally, this may be followed by a @@ -81,47 +80,41 @@ <term><option>-P</option></term> <term><option>--poweroff</option></term> - <listitem><para>Power-off the machine (the - default).</para></listitem> + <listitem><para>Power the machine off (the default).</para></listitem> </varlistentry> <varlistentry> <term><option>-r</option></term> <term><option>--reboot</option></term> - <listitem><para>Reboot the - machine.</para></listitem> + <listitem><para>Reboot the machine.</para></listitem> </varlistentry> <varlistentry> <term><option>-h</option></term> - <listitem><para>Equivalent to <option>--poweroff</option>, - unless <option>--halt</option> is specified.</para></listitem> + <listitem><para>The same as <option>--poweroff</option>, but does not override the action to take if + it is "halt". E.g. <command>shutdown --reboot -h</command> means "poweroff", but <command>shutdown + --halt -h</command> means "halt".</para></listitem> </varlistentry> <varlistentry> <term><option>-k</option></term> - <listitem><para>Do not halt, power-off, reboot, just write - wall message.</para></listitem> + <listitem><para>Do not halt, power off, or reboot, but just write the wall message.</para></listitem> </varlistentry> <varlistentry> <term><option>--no-wall</option></term> - <listitem><para>Do not send wall - message before - halt, power-off, reboot.</para></listitem> + <listitem><para>Do not send wall message before halt, power off, or reboot.</para></listitem> </varlistentry> <varlistentry> <term><option>-c</option></term> - <listitem><para>Cancel a pending shutdown. This may be used - to cancel the effect of an invocation of - <command>shutdown</command> with a time argument that is not - <literal>+0</literal> or + <listitem><para>Cancel a pending shutdown. This may be used to cancel the effect of an invocation of + <command>shutdown</command> with a time argument that is not <literal>+0</literal> or <literal>now</literal>.</para></listitem> </varlistentry> diff --git a/man/systemd-sysext.xml b/man/systemd-sysext.xml index 3ceb9fe7de..60ae4aa8bf 100644 --- a/man/systemd-sysext.xml +++ b/man/systemd-sysext.xml @@ -77,7 +77,7 @@ <para>These image formats are the same ones that <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry> - supports via it's <option>--directory=</option>/<option>--image=</option> switches and those that the + supports via its <option>--directory=</option>/<option>--image=</option> switches and those that the service manager supports via <option>RootDirectory=</option>/<option>RootImage=</option>. Similar to them they may optionally carry Verity authentication information.</para> diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml index da35a7d26b..67c59e132c 100644 --- a/man/systemd.automount.xml +++ b/man/systemd.automount.xml @@ -26,10 +26,9 @@ <refsect1> <title>Description</title> - <para>A unit configuration file whose name ends in - <literal>.automount</literal> encodes information about a file - system automount point controlled and supervised by - systemd.</para> + <para>A unit configuration file whose name ends in <literal>.automount</literal> encodes information + about a file system automount point controlled and supervised by systemd. Automount units may be used to + implement on-demand mounting as well as parallelized mounting of file systems.</para> <para>This man page lists the configuration options specific to this unit type. See @@ -39,13 +38,13 @@ [Install] sections. The automount specific configuration options are configured in the [Automount] section.</para> - <para>Automount units must be named after the automount directories they control. Example: the automount point - <filename index="false">/home/lennart</filename> must be configured in a unit file - <filename>home-lennart.automount</filename>. For details about the escaping logic used to convert a file system - path to a unit name see - <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note that - automount units cannot be templated, nor is it possible to add multiple names to an automount unit by creating - additional symlinks to its unit file.</para> + <para>Automount units must be named after the automount directories they control. Example: the automount + point <filename index="false">/home/lennart</filename> must be configured in a unit file + <filename>home-lennart.automount</filename>. For details about the escaping logic used to convert a file + system path to a unit name see + <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note + that automount units cannot be templated, nor is it possible to add multiple names to an automount unit + by creating symlinks to its unit file.</para> <para>For each automount unit file a matching mount unit file (see <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry> @@ -55,9 +54,6 @@ accesses <filename>/home/lennart</filename> the mount unit <filename>home-lennart.mount</filename> will be activated.</para> - <para>Automount units may be used to implement on-demand mounting - as well as parallelized mounting of file systems.</para> - <para>Note that automount units are separate from the mount itself, so you should not set <varname>After=</varname> or <varname>Requires=</varname> for mount dependencies here. For example, you should not set @@ -65,8 +61,11 @@ filesystems. Doing so may result in an ordering cycle.</para> <para>Note that automount support on Linux is privileged, automount units are hence only available in the - system service manager (and root's user service manager), but not in unprivileged user's service - manager.</para> + system service manager (and root's user service manager), but not in unprivileged users' service + managers.</para> + + <para>Note that automount units should not be nested. (The establishment of the inner automount point + would unconditionally pin the outer mount point, defeating its purpose.)</para> </refsect1> <refsect1> @@ -78,12 +77,12 @@ <para>The following dependencies are implicitly added:</para> <itemizedlist> - <listitem><para>If an automount unit is beneath another mount unit in the - file system hierarchy, both a requirement and an ordering - dependency between both units are created automatically.</para></listitem> + <listitem><para>If an automount unit is beneath another mount unit in the file system hierarchy, a + requirement and ordering dependencies are created to the on the unit higher in the hierarchy. + </para></listitem> - <listitem><para>An implicit <varname>Before=</varname> dependency is created - between an automount unit and the mount unit it activates.</para></listitem> + <listitem><para>An implicit <varname>Before=</varname> dependency is created between an automount + unit and the mount unit it activates.</para></listitem> </itemizedlist> </refsect2> @@ -161,6 +160,7 @@ creating these directories. Takes an access mode in octal notation. Defaults to 0755.</para></listitem> </varlistentry> + <varlistentry> <term><varname>TimeoutIdleSec=</varname></term> <listitem><para>Configures an idle timeout. Once the mount has been diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 6d21d32778..8f4ebfc788 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -59,12 +59,13 @@ does not read any options from <filename>/etc/fstab</filename>, and must be run as UID 0.</para> - <para>Mount units must be named after the mount point directories they control. Example: the mount point <filename - index="false">/home/lennart</filename> must be configured in a unit file <filename>home-lennart.mount</filename>. - For details about the escaping logic used to convert a file system path to a unit name, see - <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note that mount - units cannot be templated, nor is possible to add multiple names to a mount unit by creating additional symlinks to - it.</para> + <para>Mount units must be named after the mount point directories they control. Example: the mount point + <filename index="false">/home/lennart</filename> must be configured in a unit file + <filename>home-lennart.mount</filename>. For details about the escaping logic used to convert a file + system path to a unit name, see + <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note + that mount units cannot be templated, nor is possible to add multiple names to a mount unit by creating + symlinks to its unit file.</para> <para>Optionally, a mount unit may be accompanied by an automount unit, to allow on-demand or parallelized mounting. See diff --git a/meson.build b/meson.build index f416b4f234..c5540fc6fe 100644 --- a/meson.build +++ b/meson.build @@ -351,6 +351,9 @@ possible_common_cc_flags = [ '-Werror=shift-overflow=2', '-Werror=undef', '-Wfloat-equal', + # gperf prevents us from enabling this because it does not emit fallthrough + # attribute with clang. + #'-Wimplicit-fallthrough', '-Wimplicit-fallthrough=5', '-Winit-self', '-Wlogical-op', @@ -1497,7 +1500,7 @@ endif conf.set10('HAVE_XKBCOMMON', have) want_pcre2 = get_option('pcre2') -if want_pcre2 != 'false' +if want_pcre2 != 'false' and not skip_deps libpcre2 = dependency('libpcre2-8', required : want_pcre2 == 'true') have = libpcre2.found() @@ -2571,8 +2574,7 @@ if conf.get('ENABLE_USERDB') == 1 link_with : [libshared], dependencies : [threads], install_rpath : rootlibexecdir, - install : true, - install_dir : rootbindir) + install : true) endif if conf.get('ENABLE_HOMED') == 1 @@ -2615,8 +2617,7 @@ if conf.get('ENABLE_HOMED') == 1 libp11kit, libdl], install_rpath : rootlibexecdir, - install : true, - install_dir : rootbindir) + install : true) if conf.get('HAVE_PAM') == 1 version_script_arg = project_source_root / pam_systemd_home_sym diff --git a/src/basic/macro.h b/src/basic/macro.h index e6f89608f4..9727279155 100644 --- a/src/basic/macro.h +++ b/src/basic/macro.h @@ -11,24 +11,6 @@ #include "macro-fundamental.h" -#define _printf_(a, b) __attribute__((__format__(printf, a, b))) -#ifdef __clang__ -# define _alloc_(...) -#else -# define _alloc_(...) __attribute__((__alloc_size__(__VA_ARGS__))) -#endif -#define _sentinel_ __attribute__((__sentinel__)) -#define _destructor_ __attribute__((__destructor__)) -#define _deprecated_ __attribute__((__deprecated__)) -#define _malloc_ __attribute__((__malloc__)) -#define _weak_ __attribute__((__weak__)) -#define _public_ __attribute__((__visibility__("default"))) -#define _hidden_ __attribute__((__visibility__("hidden"))) -#define _weakref_(x) __attribute__((__weakref__(#x))) -#define _alignas_(x) __attribute__((__aligned__(__alignof__(x)))) -#define _alignptr_ __attribute__((__aligned__(sizeof(void*)))) -#define _warn_unused_result_ __attribute__((__warn_unused_result__)) - #if !defined(HAS_FEATURE_MEMORY_SANITIZER) # if defined(__has_feature) # if __has_feature(memory_sanitizer) diff --git a/src/core/device.c b/src/core/device.c index 4c261ec554..fcde8a420e 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -201,12 +201,11 @@ static int device_coldplug(Unit *u) { * Of course, deserialized parameters may be outdated, but the unit state can be adjusted later by * device_catchup() or uevents. */ - if (!m->honor_device_enumeration && !MANAGER_IS_USER(m)) { + if (!m->honor_device_enumeration && !MANAGER_IS_USER(m) && + !FLAGS_SET(d->enumerated_found, DEVICE_FOUND_UDEV)) { found &= ~DEVICE_FOUND_UDEV; /* ignore DEVICE_FOUND_UDEV bit */ if (state == DEVICE_PLUGGED) state = DEVICE_TENTATIVE; /* downgrade state */ - if (found == DEVICE_NOT_FOUND) - state = DEVICE_DEAD; /* If nobody sees the device, downgrade more */ } if (d->found == found && d->state == state) diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h index 77efb51ba0..59d63e8e5d 100644 --- a/src/fundamental/macro-fundamental.h +++ b/src/fundamental/macro-fundamental.h @@ -10,22 +10,41 @@ #include "types-fundamental.h" #define _align_(x) __attribute__((__aligned__(x))) +#define _alignas_(x) __attribute__((__aligned__(__alignof__(x)))) +#define _alignptr_ __attribute__((__aligned__(sizeof(void *)))) +#define _cleanup_(x) __attribute__((__cleanup__(x))) #define _const_ __attribute__((__const__)) -#define _pure_ __attribute__((__pure__)) -#define _section_(x) __attribute__((__section__(x))) +#define _deprecated_ __attribute__((__deprecated__)) +#define _destructor_ __attribute__((__destructor__)) +#define _hidden_ __attribute__((__visibility__("hidden"))) +#define _likely_(x) (__builtin_expect(!!(x), 1)) +#define _malloc_ __attribute__((__malloc__)) +#define _noreturn_ _Noreturn #define _packed_ __attribute__((__packed__)) +#define _printf_(a, b) __attribute__((__format__(printf, a, b))) +#define _public_ __attribute__((__visibility__("default"))) +#define _pure_ __attribute__((__pure__)) #define _retain_ __attribute__((__retain__)) -#define _used_ __attribute__((__used__)) -#define _unused_ __attribute__((__unused__)) -#define _cleanup_(x) __attribute__((__cleanup__(x))) -#define _likely_(x) (__builtin_expect(!!(x), 1)) +#define _section_(x) __attribute__((__section__(x))) +#define _sentinel_ __attribute__((__sentinel__)) #define _unlikely_(x) (__builtin_expect(!!(x), 0)) -#if __GNUC__ >= 7 -#define _fallthrough_ __attribute__((__fallthrough__)) +#define _unused_ __attribute__((__unused__)) +#define _used_ __attribute__((__used__)) +#define _warn_unused_result_ __attribute__((__warn_unused_result__)) +#define _weak_ __attribute__((__weak__)) +#define _weakref_(x) __attribute__((__weakref__(#x))) + +#ifdef __clang__ +# define _alloc_(...) #else -#define _fallthrough_ +# define _alloc_(...) __attribute__((__alloc_size__(__VA_ARGS__))) +#endif + +#if __GNUC__ >= 7 || __clang__ +# define _fallthrough_ __attribute__((__fallthrough__)) +#else +# define _fallthrough_ #endif -#define _noreturn_ _Noreturn #define XSTRINGIFY(x) #x #define STRINGIFY(x) XSTRINGIFY(x) diff --git a/src/fundamental/string-util-fundamental.c b/src/fundamental/string-util-fundamental.c index feccb822ff..169568e244 100644 --- a/src/fundamental/string-util-fundamental.c +++ b/src/fundamental/string-util-fundamental.c @@ -124,8 +124,8 @@ sd_int strverscmp_improved(const sd_char *a, const sd_char *b) { * (newer) 124-1 */ - if (isempty(a) || isempty(b)) - return CMP(strcmp_ptr(a, b), 0); + a = strempty(a); + b = strempty(b); for (;;) { const sd_char *aa, *bb; @@ -150,7 +150,7 @@ sd_int strverscmp_improved(const sd_char *a, const sd_char *b) { } /* If at least one string reaches the end, then longer is newer. - * Note that except for '~' prefixed segments, a string has more segments is newer. + * Note that except for '~' prefixed segments, a string which has more segments is newer. * So, this check must be after the '~' check. */ if (*a == '\0' || *b == '\0') return CMP(*a, *b); @@ -187,12 +187,6 @@ sd_int strverscmp_improved(const sd_char *a, const sd_char *b) { } if (is_digit(*a) || is_digit(*b)) { - /* Skip leading '0', to make 00123 equivalent to 123. */ - while (*a == '0') - a++; - while (*b == '0') - b++; - /* Find the leading numeric segments. One may be an empty string. So, * numeric segments are always newer than alpha segments. */ for (aa = a; is_digit(*aa); aa++) @@ -200,6 +194,17 @@ sd_int strverscmp_improved(const sd_char *a, const sd_char *b) { for (bb = b; is_digit(*bb); bb++) ; + /* Check if one of the strings was empty, but the other not. */ + r = CMP(a != aa, b != bb); + if (r != 0) + return r; + + /* Skip leading '0', to make 00123 equivalent to 123. */ + while (*a == '0') + a++; + while (*b == '0') + b++; + /* To compare numeric segments without parsing their values, first compare the * lengths of the segments. Eg. 12345 vs 123, longer is newer. */ r = CMP(aa - a, bb - b); @@ -228,7 +233,7 @@ sd_int strverscmp_improved(const sd_char *a, const sd_char *b) { return r; } - /* The current segments are equivalent. Let's compare the next one. */ + /* The current segments are equivalent. Let's move to the next one. */ a = aa; b = bb; } diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c index 17ac7e4fbe..6925aecd84 100644 --- a/src/hwdb/hwdb.c +++ b/src/hwdb/hwdb.c @@ -18,7 +18,7 @@ static const char *arg_root = NULL; static bool arg_strict = false; static int verb_query(int argc, char *argv[], void *userdata) { - return hwdb_query(argv[1]); + return hwdb_query(argv[1], arg_root); } static int verb_update(int argc, char *argv[], void *userdata) { diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in index 3da233ef6e..2e1965852e 100755 --- a/src/kernel-install/kernel-install.in +++ b/src/kernel-install/kernel-install.in @@ -329,7 +329,7 @@ case "$COMMAND" in err=$? [ $err -eq $skip_remaining ] && break - ret=$(( ret + err )) + [ $err -ne 0 ] && exit $err done ;; @@ -339,7 +339,7 @@ case "$COMMAND" in "$f" remove "$KERNEL_VERSION" "$ENTRY_DIR_ABS" err=$? [ $err -eq $skip_remaining ] && break - ret=$(( ret + err )) + [ $err -ne 0 ] && exit $err done if [ "$MAKE_ENTRY_DIR_ABS" -eq 0 ]; then diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym index ccc321ec33..528e86b663 100644 --- a/src/libsystemd/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym @@ -778,3 +778,8 @@ global: sd_device_open; sd_device_enumerator_add_nomatch_sysname; } LIBSYSTEMD_250; + +LIBSYSTEMD_252 { +global: + sd_hwdb_new_from_path; +} LIBSYSTEMD_251; diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build index 8a03890d8b..c3eef87b84 100644 --- a/src/libsystemd/meson.build +++ b/src/libsystemd/meson.build @@ -222,7 +222,8 @@ tests += [ libglib, libgobject, libgio, - libdbus]], + libdbus, + libm]], [files('sd-bus/test-bus-signature.c'), [], diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index b77372c3a0..026ec101e3 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -428,7 +428,7 @@ int bus_message_from_header( _cleanup_free_ sd_bus_message *m = NULL; struct bus_header *h; - size_t a, label_sz; + size_t a, label_sz = 0; /* avoid false maybe-uninitialized warning */ assert(bus); assert(header || header_accessible <= 0); @@ -506,7 +506,10 @@ int bus_message_from_header( m->fields_size = BUS_MESSAGE_BSWAP32(m, h->dbus1.fields_size); m->body_size = BUS_MESSAGE_BSWAP32(m, h->dbus1.body_size); - if (sizeof(struct bus_header) + ALIGN8(m->fields_size) + m->body_size != message_size) + assert(message_size >= sizeof(struct bus_header)); + if (m->fields_size > message_size - sizeof(struct bus_header) || + ALIGN8(m->fields_size) > message_size - sizeof(struct bus_header) || + m->body_size != message_size - sizeof(struct bus_header) - ALIGN8(m->fields_size)) return -EBADMSG; } @@ -3061,15 +3064,21 @@ void bus_body_part_unmap(struct bus_body_part *part) { return; } -static int buffer_peek(const void *p, uint32_t sz, size_t *rindex, size_t align, size_t nbytes, void **r) { +static int buffer_peek(const void *p, size_t sz, size_t *rindex, size_t align, size_t nbytes, void **r) { size_t k, start, end; assert(rindex); assert(align > 0); - start = ALIGN_TO((size_t) *rindex, align); - end = start + nbytes; + start = ALIGN_TO(*rindex, align); + if (start > sz) + return -EBADMSG; + + /* Avoid overflow below */ + if (nbytes > SIZE_MAX - start) + return -EBADMSG; + end = start + nbytes; if (end > sz) return -EBADMSG; @@ -3272,10 +3281,17 @@ static int message_peek_body( assert(rindex); assert(align > 0); - start = ALIGN_TO((size_t) *rindex, align); + start = ALIGN_TO(*rindex, align); + if (start > m->user_body_size) + return -EBADMSG; + padding = start - *rindex; - end = start + nbytes; + /* Avoid overflow below */ + if (nbytes > SIZE_MAX - start) + return -EBADMSG; + + end = start + nbytes; if (end > m->user_body_size) return -EBADMSG; diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h index 5ddc2211e6..62d27f7b89 100644 --- a/src/libsystemd/sd-hwdb/hwdb-internal.h +++ b/src/libsystemd/sd-hwdb/hwdb-internal.h @@ -2,6 +2,7 @@ #pragma once #include <stdint.h> +#include <sys/stat.h> #include "def.h" #include "hashmap.h" diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c index 748cf26934..f73d1fc21e 100644 --- a/src/libsystemd/sd-hwdb/sd-hwdb.c +++ b/src/libsystemd/sd-hwdb/sd-hwdb.c @@ -281,9 +281,9 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { return 0; } -_public_ int sd_hwdb_new(sd_hwdb **ret) { +static int hwdb_new(const char *path, sd_hwdb **ret) { _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; - const char *hwdb_bin_path; + const char *hwdb_bin_path = NULL; const char sig[] = HWDB_SIG; assert_return(ret, -EINVAL); @@ -294,19 +294,26 @@ _public_ int sd_hwdb_new(sd_hwdb **ret) { hwdb->n_ref = 1; - /* find hwdb.bin in hwdb_bin_paths */ - NULSTR_FOREACH(hwdb_bin_path, hwdb_bin_paths) { - log_debug("Trying to open \"%s\"...", hwdb_bin_path); - hwdb->f = fopen(hwdb_bin_path, "re"); - if (hwdb->f) - break; - if (errno != ENOENT) - return log_debug_errno(errno, "Failed to open %s: %m", hwdb_bin_path); - } + /* find hwdb.bin in hwdb_bin_paths, or from an explicit path if provided */ + if (!isempty(path)) { + log_debug("Trying to open \"%s\"...", path); + hwdb->f = fopen(path, "re"); + if (!hwdb->f) + return log_debug_errno(errno, "Failed to open %s: %m", path); + } else { + NULSTR_FOREACH(hwdb_bin_path, hwdb_bin_paths) { + log_debug("Trying to open \"%s\"...", hwdb_bin_path); + hwdb->f = fopen(hwdb_bin_path, "re"); + if (hwdb->f) + break; + if (errno != ENOENT) + return log_debug_errno(errno, "Failed to open %s: %m", hwdb_bin_path); + } - if (!hwdb->f) - return log_debug_errno(SYNTHETIC_ERRNO(ENOENT), - "hwdb.bin does not exist, please run 'systemd-hwdb update'"); + if (!hwdb->f) + return log_debug_errno(SYNTHETIC_ERRNO(ENOENT), + "hwdb.bin does not exist, please run 'systemd-hwdb update'"); + } if (fstat(fileno(hwdb->f), &hwdb->st) < 0) return log_debug_errno(errno, "Failed to stat %s: %m", hwdb_bin_path); @@ -339,6 +346,16 @@ _public_ int sd_hwdb_new(sd_hwdb **ret) { return 0; } +_public_ int sd_hwdb_new_from_path(const char *path, sd_hwdb **ret) { + assert_return(!isempty(path), -EINVAL); + + return hwdb_new(path, ret); +} + +_public_ int sd_hwdb_new(sd_hwdb **ret) { + return hwdb_new(NULL, ret); +} + static sd_hwdb *hwdb_free(sd_hwdb *hwdb) { assert(hwdb); diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index 19e00b996e..003dbc0a95 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -120,7 +120,7 @@ static int session_device_open(SessionDevice *sd, bool active) { assert(sd->type != DEVICE_TYPE_UNKNOWN); assert(sd->node); - /* open device and try to get an udev_device from it */ + /* open device and try to get a udev_device from it */ fd = open(sd->node, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK); if (fd < 0) return -errno; diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c index e87f1d31b3..e24828450f 100644 --- a/src/nss-systemd/nss-systemd.c +++ b/src/nss-systemd/nss-systemd.c @@ -46,7 +46,7 @@ static const struct passwd nobody_passwd = { .pw_passwd = (char*) PASSWORD_LOCKED_AND_INVALID, .pw_uid = UID_NOBODY, .pw_gid = GID_NOBODY, - .pw_gecos = (char*) "User Nobody", + .pw_gecos = (char*) "Kernel Overflow User", .pw_dir = (char*) "/", .pw_shell = (char*) NOLOGIN, }; diff --git a/src/rpm/triggers.systemd.in b/src/rpm/triggers.systemd.in index 4755cdafe8..b563c7a739 100644 --- a/src/rpm/triggers.systemd.in +++ b/src/rpm/triggers.systemd.in @@ -72,32 +72,17 @@ end -- This script will process files installed in {{SYSUSERS_DIR}} to create -- specified users automatically. The priority is set such that it -- will run before the tmpfiles file trigger. -pid = posix.fork() -if pid == 0 then - assert(posix.execp("systemd-sysusers")) -elseif pid > 0 then - posix.wait(pid) -end +assert(rpm.execute("systemd-sysusers")) %transfiletriggerin -P 1000700 udev -p <lua> -- {{UDEV_HWDB_DIR}} -- This script will automatically invoke hwdb update if files have been -- installed or updated in {{UDEV_HWDB_DIR}}. -pid = posix.fork() -if pid == 0 then - assert(posix.execp("systemd-hwdb", "update")) -elseif pid > 0 then - posix.wait(pid) -end +assert(rpm.execute("systemd-hwdb", "update")) %transfiletriggerin -P 1000700 -p <lua> -- {{SYSTEMD_CATALOG_DIR}} -- This script will automatically invoke journal catalog update if files -- have been installed or updated in {{SYSTEMD_CATALOG_DIR}}. -pid = posix.fork() -if pid == 0 then - assert(posix.execp("journalctl", "--update-catalog")) -elseif pid > 0 then - posix.wait(pid) -end +assert(rpm.execute("journalctl", "--update-catalog")) %transfiletriggerin -P 1000700 -p <lua> -- {{BINFMT_DIR}} -- This script will automatically apply binfmt rules if files have been @@ -115,25 +100,13 @@ end -- This script will process files installed in {{TMPFILES_DIR}} to create -- tmpfiles automatically. The priority is set such that it will run -- after the sysusers file trigger, but before any other triggers. -if posix.access("/run/systemd/system") then - pid = posix.fork() - if pid == 0 then - assert(posix.execp("systemd-tmpfiles", "--create")) - elseif pid > 0 then - posix.wait(pid) - end -end +assert(rpm.execute("systemd-tmpfiles", "--create")) %transfiletriggerin -P 1000600 udev -p <lua> -- {{UDEV_RULES_DIR}} -- This script will automatically update udev with new rules if files -- have been installed or updated in {{UDEV_RULES_DIR}}. -if posix.access("/run/systemd/system") then - pid = posix.fork() - if pid == 0 then - assert(posix.execp("udevadm", "control", "--reload")) - elseif pid > 0 then - posix.wait(pid) - end +if posix.access("/run/udev/control") then + assert(rpm.execute("udevadm", "control", "--reload")) end %transfiletriggerin -P 1000500 -p <lua> -- {{SYSCTL_DIR}} diff --git a/src/shared/find-esp.c b/src/shared/find-esp.c index 75e639dd99..09c09c8e7e 100644 --- a/src/shared/find-esp.c +++ b/src/shared/find-esp.c @@ -7,6 +7,7 @@ #include "alloc-util.h" #include "blkid-util.h" +#include "device-util.h" #include "devnum-util.h" #include "env-util.h" #include "errno-util.h" @@ -474,16 +475,18 @@ static int verify_xbootldr_blkid( #if HAVE_BLKID _cleanup_(blkid_free_probep) blkid_probe b = NULL; _cleanup_free_ char *node = NULL; - const char *v; + const char *type, *v; int r; r = device_path_make_major_minor(S_IFBLK, devid, &node); if (r < 0) - return log_error_errno(r, "Failed to format major/minor device path: %m"); + return log_error_errno(r, "Failed to format block device path for %u:%u: %m", + major(devid), minor(devid)); + errno = 0; b = blkid_new_probe_from_filename(node); if (!b) - return log_error_errno(errno ?: SYNTHETIC_ERRNO(ENOMEM), "Failed to open file system \"%s\": %m", node); + return log_error_errno(errno ?: SYNTHETIC_ERRNO(ENOMEM), "%s: Failed to create blkid probe: %m", node); blkid_probe_enable_partitions(b, 1); blkid_probe_set_partitions_flags(b, BLKID_PARTS_ENTRY_DETAILS); @@ -491,50 +494,50 @@ static int verify_xbootldr_blkid( errno = 0; r = blkid_do_safeprobe(b); if (r == -2) - return log_error_errno(SYNTHETIC_ERRNO(ENODEV), "File system \"%s\" is ambiguous.", node); + return log_error_errno(SYNTHETIC_ERRNO(ENODEV), "%s: File system is ambiguous.", node); else if (r == 1) - return log_error_errno(SYNTHETIC_ERRNO(ENODEV), "File system \"%s\" does not contain a label.", node); + return log_error_errno(SYNTHETIC_ERRNO(ENODEV), "%s: File system does not contain a label.", node); else if (r != 0) - return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "Failed to probe file system \"%s\": %m", node); + return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "%s: Failed to probe file system: %m", node); errno = 0; - r = blkid_probe_lookup_value(b, "PART_ENTRY_SCHEME", &v, NULL); + r = blkid_probe_lookup_value(b, "PART_ENTRY_SCHEME", &type, NULL); if (r != 0) - return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "Failed to probe partition scheme of \"%s\": %m", node); - if (streq(v, "gpt")) { + return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "%s: Failed to probe PART_ENTRY_SCHEME: %m", node); + if (streq(type, "gpt")) { errno = 0; r = blkid_probe_lookup_value(b, "PART_ENTRY_TYPE", &v, NULL); if (r != 0) - return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "Failed to probe partition type UUID of \"%s\": %m", node); + return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "%s: Failed to probe PART_ENTRY_TYPE: %m", node); if (id128_equal_string(v, GPT_XBOOTLDR) <= 0) return log_full_errno(searching ? LOG_DEBUG : LOG_ERR, searching ? SYNTHETIC_ERRNO(EADDRNOTAVAIL) : SYNTHETIC_ERRNO(ENODEV), - "File system \"%s\" has wrong type for extended boot loader partition.", node); + "%s: Partitition has wrong PART_ENTRY_TYPE=%s for XBOOTLDR partition.", node, v); errno = 0; r = blkid_probe_lookup_value(b, "PART_ENTRY_UUID", &v, NULL); if (r != 0) - return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "Failed to probe partition entry UUID of \"%s\": %m", node); + return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "%s: Failed to probe PART_ENTRY_UUID: %m", node); r = sd_id128_from_string(v, &uuid); if (r < 0) - return log_error_errno(r, "Partition \"%s\" has invalid UUID \"%s\".", node, v); + return log_error_errno(r, "%s: Partition has invalid UUID PART_ENTRY_TYPE=%s: %m", node, v); - } else if (streq(v, "dos")) { + } else if (streq(type, "dos")) { errno = 0; r = blkid_probe_lookup_value(b, "PART_ENTRY_TYPE", &v, NULL); if (r != 0) - return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "Failed to probe partition type UUID of \"%s\": %m", node); + return log_error_errno(errno ?: SYNTHETIC_ERRNO(EIO), "%s: Failed to probe PART_ENTRY_TYPE: %m", node); if (!streq(v, "0xea")) return log_full_errno(searching ? LOG_DEBUG : LOG_ERR, searching ? SYNTHETIC_ERRNO(EADDRNOTAVAIL) : SYNTHETIC_ERRNO(ENODEV), - "File system \"%s\" has wrong type for extended boot loader partition.", node); + "%s: Wrong PART_ENTRY_TYPE=%s for XBOOTLDR partition.", node, v); } else return log_full_errno(searching ? LOG_DEBUG : LOG_ERR, searching ? SYNTHETIC_ERRNO(EADDRNOTAVAIL) : SYNTHETIC_ERRNO(ENODEV), - "File system \"%s\" is not on a GPT or DOS partition table.", node); + "%s: Not on a GPT or DOS partition table (PART_ENTRY_SCHEME=%s).", node, type); #endif if (ret_uuid) @@ -551,51 +554,63 @@ static int verify_xbootldr_udev( _cleanup_(sd_device_unrefp) sd_device *d = NULL; _cleanup_free_ char *node = NULL; sd_id128_t uuid = SD_ID128_NULL; - const char *v; + const char *type, *v; int r; r = device_path_make_major_minor(S_IFBLK, devid, &node); if (r < 0) - return log_error_errno(r, "Failed to format major/minor device path: %m"); + return log_error_errno(r, "Failed to format block device path for %u:%u: %m", + major(devid), minor(devid)); r = sd_device_new_from_devnum(&d, 'b', devid); if (r < 0) - return log_error_errno(r, "Failed to get device from device number: %m"); + return log_error_errno(r, "%s: Failed to get block device: %m", node); - r = sd_device_get_property_value(d, "ID_PART_ENTRY_SCHEME", &v); + r = sd_device_get_property_value(d, "ID_PART_ENTRY_SCHEME", &type); if (r < 0) - return log_error_errno(r, "Failed to get device property: %m"); + return log_device_error_errno(d, r, "Failed to query ID_PART_ENTRY_SCHEME: %m"); - if (streq(v, "gpt")) { + if (streq(type, "gpt")) { r = sd_device_get_property_value(d, "ID_PART_ENTRY_TYPE", &v); if (r < 0) - return log_error_errno(r, "Failed to get device property: %m"); - if (id128_equal_string(v, GPT_XBOOTLDR)) - return log_full_errno(searching ? LOG_DEBUG : LOG_ERR, - searching ? SYNTHETIC_ERRNO(EADDRNOTAVAIL) : SYNTHETIC_ERRNO(ENODEV), - "File system \"%s\" has wrong type for extended boot loader partition.", node); + return log_device_error_errno(d, r, "Failed to query ID_PART_ENTRY_TYPE: %m"); + + r = id128_equal_string(v, GPT_XBOOTLDR); + if (r < 0) + return log_device_error_errno(d, r, "Failed to parse ID_PART_ENTRY_TYPE=%s: %m", v); + if (r == 0) + return log_device_full_errno( + d, + searching ? LOG_DEBUG : LOG_ERR, + searching ? SYNTHETIC_ERRNO(EADDRNOTAVAIL) : SYNTHETIC_ERRNO(ENODEV), + "Parition has wrong ID_PART_ENTRY_TYPE=%s for XBOOTLDR partition.", v); r = sd_device_get_property_value(d, "ID_PART_ENTRY_UUID", &v); if (r < 0) - return log_error_errno(r, "Failed to get device property: %m"); + return log_device_error_errno(d, r, "Failed to query ID_PART_ENTRY_UUID: %m"); r = sd_id128_from_string(v, &uuid); if (r < 0) - return log_error_errno(r, "Partition \"%s\" has invalid UUID \"%s\".", node, v); + return log_device_error_errno(d, r, "Partition has invalid UUID ID_PART_ENTRY_TYPE=%s: %m", v); - } else if (streq(v, "dos")) { + } else if (streq(type, "dos")) { r = sd_device_get_property_value(d, "ID_PART_ENTRY_TYPE", &v); if (r < 0) - return log_error_errno(r, "Failed to get device property: %m"); + return log_device_error_errno(d, r, "Failed to query ID_PART_ENTRY_TYPE: %m"); if (!streq(v, "0xea")) - return log_full_errno(searching ? LOG_DEBUG : LOG_ERR, - searching ? SYNTHETIC_ERRNO(EADDRNOTAVAIL) : SYNTHETIC_ERRNO(ENODEV), - "File system \"%s\" has wrong type for extended boot loader partition.", node); + return log_device_full_errno( + d, + searching ? LOG_DEBUG : LOG_ERR, + searching ? SYNTHETIC_ERRNO(EADDRNOTAVAIL) : SYNTHETIC_ERRNO(ENODEV), + "Wrong ID_PART_ENTRY_TYPE=%s for XBOOTLDR partition.", v); + } else - return log_full_errno(searching ? LOG_DEBUG : LOG_ERR, - searching ? SYNTHETIC_ERRNO(EADDRNOTAVAIL) : SYNTHETIC_ERRNO(ENODEV), - "File system \"%s\" is not on a GPT or DOS partition table.", node); + return log_device_full_errno( + d, + searching ? LOG_DEBUG : LOG_ERR, + searching ? SYNTHETIC_ERRNO(EADDRNOTAVAIL) : SYNTHETIC_ERRNO(ENODEV), + "Not on a GPT or DOS partition table (ID_PART_ENTRY_SCHEME=%s).", type); if (ret_uuid) *ret_uuid = uuid; diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c index f98d03f766..1ec861f76f 100644 --- a/src/shared/hwdb-util.c +++ b/src/shared/hwdb-util.c @@ -650,14 +650,27 @@ int hwdb_update(const char *root, const char *hwdb_bin_dir, bool strict, bool co return r; } -int hwdb_query(const char *modalias) { +int hwdb_query(const char *modalias, const char *root) { _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; - const char *key, *value; + const char *key, *value, *p; int r; assert(modalias); - r = sd_hwdb_new(&hwdb); + if (!isempty(root)) + NULSTR_FOREACH(p, hwdb_bin_paths) { + _cleanup_free_ char *hwdb_bin = NULL; + + hwdb_bin = path_join(root, p); + if (!hwdb_bin) + return -ENOMEM; + + r = sd_hwdb_new_from_path(hwdb_bin, &hwdb); + if (r >= 0) + break; + } + else + r = sd_hwdb_new(&hwdb); if (r < 0) return r; diff --git a/src/shared/hwdb-util.h b/src/shared/hwdb-util.h index 5afde74723..bfecddea42 100644 --- a/src/shared/hwdb-util.h +++ b/src/shared/hwdb-util.h @@ -7,4 +7,4 @@ bool hwdb_validate(sd_hwdb *hwdb); int hwdb_update(const char *root, const char *hwdb_bin_dir, bool strict, bool compat); -int hwdb_query(const char *modalias); +int hwdb_query(const char *modalias, const char *root); diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 10a67efbd1..c13e88b594 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -86,6 +86,9 @@ foreach header : _systemd_headers + _not_installed_headers + [libudev_h_path] '-Wall', '-Wextra', '-Werror', + '-pedantic', + '-Wno-long-long', + '-Wno-variadic-macros', '-include', meson.current_source_dir() / header, '-o/dev/null', '/dev/null']) diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h index 8b316fac5a..bed6160042 100644 --- a/src/systemd/sd-bus-vtable.h +++ b/src/systemd/sd-bus-vtable.h @@ -34,7 +34,7 @@ enum { _SD_BUS_VTABLE_WRITABLE_PROPERTY = 'W' }; -enum { +__extension__ enum { SD_BUS_VTABLE_DEPRECATED = 1ULL << 0, SD_BUS_VTABLE_HIDDEN = 1ULL << 1, SD_BUS_VTABLE_UNPRIVILEGED = 1ULL << 2, @@ -51,7 +51,7 @@ enum { #define SD_BUS_VTABLE_CAPABILITY(x) ((uint64_t) (((x)+1) & 0xFFFF) << 40) enum { - _SD_BUS_VTABLE_PARAM_NAMES = 1 << 0, + _SD_BUS_VTABLE_PARAM_NAMES = 1 << 0 }; extern const unsigned sd_bus_object_vtable_format; @@ -67,8 +67,8 @@ struct sd_bus_vtable { /* Please do not initialize this structure directly, use the * macros below instead */ - uint8_t type:8; - uint64_t flags:56; + __extension__ uint8_t type:8; + __extension__ uint64_t flags:56; union { struct { size_t element_size; diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index a07a76170c..1f3e462a0d 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -55,7 +55,7 @@ typedef struct { /* Flags */ -enum { +__extension__ enum { SD_BUS_CREDS_PID = 1ULL << 0, SD_BUS_CREDS_TID = 1ULL << 1, SD_BUS_CREDS_PPID = 1ULL << 2, @@ -94,15 +94,15 @@ enum { _SD_BUS_CREDS_ALL = (1ULL << 34) -1 }; -enum { +__extension__ enum { SD_BUS_NAME_REPLACE_EXISTING = 1ULL << 0, SD_BUS_NAME_ALLOW_REPLACEMENT = 1ULL << 1, SD_BUS_NAME_QUEUE = 1ULL << 2 }; -enum { +__extension__ enum { SD_BUS_MESSAGE_DUMP_WITH_HEADER = 1ULL << 0, - SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY = 1ULL << 1, + SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY = 1ULL << 1 }; /* Callbacks */ diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h index 2d12288864..55b0338ffe 100644 --- a/src/systemd/sd-device.h +++ b/src/systemd/sd-device.h @@ -34,7 +34,7 @@ typedef struct sd_device sd_device; typedef struct sd_device_enumerator sd_device_enumerator; typedef struct sd_device_monitor sd_device_monitor; -typedef enum sd_device_action_t { +__extension__ typedef enum sd_device_action_t { SD_DEVICE_ADD, SD_DEVICE_REMOVE, SD_DEVICE_CHANGE, @@ -45,7 +45,7 @@ typedef enum sd_device_action_t { SD_DEVICE_UNBIND, _SD_DEVICE_ACTION_MAX, _SD_DEVICE_ACTION_INVALID = -EINVAL, - _SD_ENUM_FORCE_S64(DEVICE_ACTION), + _SD_ENUM_FORCE_S64(DEVICE_ACTION) } sd_device_action_t; /* callback */ diff --git a/src/systemd/sd-dhcp-client.h b/src/systemd/sd-dhcp-client.h index 20c1894aaa..da0d9d2b8b 100644 --- a/src/systemd/sd-dhcp-client.h +++ b/src/systemd/sd-dhcp-client.h @@ -40,8 +40,8 @@ enum { SD_DHCP_CLIENT_EVENT_EXPIRED = 3, SD_DHCP_CLIENT_EVENT_RENEW = 4, SD_DHCP_CLIENT_EVENT_SELECTING = 5, - SD_DHCP_CLIENT_EVENT_TRANSIENT_FAILURE = 6, /* Sent when we have not received a reply after the first few attempts. - * The client may want to start acquiring link-local addresses. */ + SD_DHCP_CLIENT_EVENT_TRANSIENT_FAILURE = 6 /* Sent when we have not received a reply after the first few attempts. + * The client may want to start acquiring link-local addresses. */ }; /* https://www.iana.org/assignments/bootp-dhcp-parameters/bootp-dhcp-parameters.xhtml#options */ @@ -212,13 +212,13 @@ enum { SD_DHCP_OPTION_PRIVATE_CLASSLESS_STATIC_ROUTE = 249, /* [RFC7844] */ SD_DHCP_OPTION_PRIVATE_PROXY_AUTODISCOVERY = 252, /* [RFC7844] */ SD_DHCP_OPTION_PRIVATE_LAST = 254, - SD_DHCP_OPTION_END = 255, /* [RFC2132] */ + SD_DHCP_OPTION_END = 255 /* [RFC2132] */ }; /* Suboptions for SD_DHCP_OPTION_RELAY_AGENT_INFORMATION option */ enum { SD_DHCP_RELAY_AGENT_CIRCUIT_ID = 1, - SD_DHCP_RELAY_AGENT_REMOTE_ID = 2, + SD_DHCP_RELAY_AGENT_REMOTE_ID = 2 }; typedef struct sd_dhcp_client sd_dhcp_client; @@ -256,14 +256,14 @@ int sd_dhcp_client_set_client_id( uint8_t type, const uint8_t *data, size_t data_len); -int sd_dhcp_client_set_iaid_duid( +__extension__ int sd_dhcp_client_set_iaid_duid( sd_dhcp_client *client, bool iaid_set, uint32_t iaid, uint16_t duid_type, const void *duid, size_t duid_len); -int sd_dhcp_client_set_iaid_duid_llt( +__extension__ int sd_dhcp_client_set_iaid_duid_llt( sd_dhcp_client *client, bool iaid_set, uint32_t iaid, diff --git a/src/systemd/sd-dhcp-lease.h b/src/systemd/sd-dhcp-lease.h index 578ac6d4db..2a7e720fea 100644 --- a/src/systemd/sd-dhcp-lease.h +++ b/src/systemd/sd-dhcp-lease.h @@ -34,7 +34,7 @@ typedef struct sd_dhcp_route sd_dhcp_route; sd_dhcp_lease *sd_dhcp_lease_ref(sd_dhcp_lease *lease); sd_dhcp_lease *sd_dhcp_lease_unref(sd_dhcp_lease *lease); -typedef enum sd_dhcp_lease_server_type_t { +__extension__ typedef enum sd_dhcp_lease_server_type_t { SD_DHCP_LEASE_DNS, SD_DHCP_LEASE_NTP, SD_DHCP_LEASE_SIP, @@ -43,7 +43,7 @@ typedef enum sd_dhcp_lease_server_type_t { SD_DHCP_LEASE_LPR, _SD_DHCP_LEASE_SERVER_TYPE_MAX, _SD_DHCP_LEASE_SERVER_TYPE_INVALID = -EINVAL, - _SD_ENUM_FORCE_S64(DHCP_LEASE_SERVER_TYPE), + _SD_ENUM_FORCE_S64(DHCP_LEASE_SERVER_TYPE) } sd_dhcp_lease_server_type_t; int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr); diff --git a/src/systemd/sd-dhcp-server.h b/src/systemd/sd-dhcp-server.h index 371834dd8d..a8ca76d2ae 100644 --- a/src/systemd/sd-dhcp-server.h +++ b/src/systemd/sd-dhcp-server.h @@ -32,7 +32,7 @@ _SD_BEGIN_DECLARATIONS; typedef struct sd_dhcp_server sd_dhcp_server; enum { - SD_DHCP_SERVER_EVENT_LEASE_CHANGED = 1 << 0, + SD_DHCP_SERVER_EVENT_LEASE_CHANGED = 1 << 0 }; int sd_dhcp_server_new(sd_dhcp_server **ret, int ifindex); diff --git a/src/systemd/sd-dhcp6-client.h b/src/systemd/sd-dhcp6-client.h index 9d6b99ca30..77139a664b 100644 --- a/src/systemd/sd-dhcp6-client.h +++ b/src/systemd/sd-dhcp6-client.h @@ -36,7 +36,7 @@ enum { SD_DHCP6_CLIENT_EVENT_RESEND_EXPIRE = 10, SD_DHCP6_CLIENT_EVENT_RETRANS_MAX = 11, SD_DHCP6_CLIENT_EVENT_IP_ACQUIRE = 12, - SD_DHCP6_CLIENT_EVENT_INFORMATION_REQUEST = 13, + SD_DHCP6_CLIENT_EVENT_INFORMATION_REQUEST = 13 }; /* https://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xhtml#dhcpv6-parameters-2 */ @@ -183,7 +183,7 @@ enum { SD_DHCP6_OPTION_SLAP_QUAD = 140, /* RFC 8948 */ SD_DHCP6_OPTION_V6_DOTS_RI = 141, /* RFC 8973 */ SD_DHCP6_OPTION_V6_DOTS_ADDRESS = 142, /* RFC 8973 */ - SD_DHCP6_OPTION_IPV6_ADDRESS_ANDSF = 143, /* RFC 6153 */ + SD_DHCP6_OPTION_IPV6_ADDRESS_ANDSF = 143 /* RFC 6153 */ /* option codes 144-65535 are unassigned */ }; diff --git a/src/systemd/sd-hwdb.h b/src/systemd/sd-hwdb.h index 9380759e07..9eee1c192b 100644 --- a/src/systemd/sd-hwdb.h +++ b/src/systemd/sd-hwdb.h @@ -27,6 +27,7 @@ sd_hwdb *sd_hwdb_ref(sd_hwdb *hwdb); sd_hwdb *sd_hwdb_unref(sd_hwdb *hwdb); int sd_hwdb_new(sd_hwdb **ret); +int sd_hwdb_new_from_path(const char *path, sd_hwdb **ret); int sd_hwdb_get(sd_hwdb *hwdb, const char *modalias, const char *key, const char **value); diff --git a/src/systemd/sd-ipv4acd.h b/src/systemd/sd-ipv4acd.h index 90d3f0a0d1..24a0bab7e4 100644 --- a/src/systemd/sd-ipv4acd.h +++ b/src/systemd/sd-ipv4acd.h @@ -31,7 +31,7 @@ _SD_BEGIN_DECLARATIONS; enum { SD_IPV4ACD_EVENT_STOP = 0, SD_IPV4ACD_EVENT_BIND = 1, - SD_IPV4ACD_EVENT_CONFLICT = 2, + SD_IPV4ACD_EVENT_CONFLICT = 2 }; typedef struct sd_ipv4acd sd_ipv4acd; @@ -50,7 +50,7 @@ int sd_ipv4acd_set_ifname(sd_ipv4acd *acd, const char *interface_name); int sd_ipv4acd_get_ifname(sd_ipv4acd *acd, const char **ret); int sd_ipv4acd_set_address(sd_ipv4acd *acd, const struct in_addr *address); int sd_ipv4acd_is_running(sd_ipv4acd *acd); -int sd_ipv4acd_start(sd_ipv4acd *acd, bool reset_conflicts); +__extension__ int sd_ipv4acd_start(sd_ipv4acd *acd, bool reset_conflicts); int sd_ipv4acd_stop(sd_ipv4acd *acd); sd_ipv4acd *sd_ipv4acd_ref(sd_ipv4acd *acd); sd_ipv4acd *sd_ipv4acd_unref(sd_ipv4acd *acd); diff --git a/src/systemd/sd-ipv4ll.h b/src/systemd/sd-ipv4ll.h index ed014b53f2..58f6f169ec 100644 --- a/src/systemd/sd-ipv4ll.h +++ b/src/systemd/sd-ipv4ll.h @@ -31,7 +31,7 @@ _SD_BEGIN_DECLARATIONS; enum { SD_IPV4LL_EVENT_STOP = 0, SD_IPV4LL_EVENT_BIND = 1, - SD_IPV4LL_EVENT_CONFLICT = 2, + SD_IPV4LL_EVENT_CONFLICT = 2 }; typedef struct sd_ipv4ll sd_ipv4ll; diff --git a/src/systemd/sd-lldp-rx.h b/src/systemd/sd-lldp-rx.h index bfeac14ce3..fbbe7dc22a 100644 --- a/src/systemd/sd-lldp-rx.h +++ b/src/systemd/sd-lldp-rx.h @@ -32,14 +32,14 @@ _SD_BEGIN_DECLARATIONS; typedef struct sd_lldp_rx sd_lldp_rx; typedef struct sd_lldp_neighbor sd_lldp_neighbor; -typedef enum sd_lldp_rx_event_t { +__extension__ typedef enum sd_lldp_rx_event_t { SD_LLDP_RX_EVENT_ADDED, SD_LLDP_RX_EVENT_REMOVED, SD_LLDP_RX_EVENT_UPDATED, SD_LLDP_RX_EVENT_REFRESHED, _SD_LLDP_RX_EVENT_MAX, _SD_LLDP_RX_EVENT_INVALID = -EINVAL, - _SD_ENUM_FORCE_S64(LLDP_RX_EVENT), + _SD_ENUM_FORCE_S64(LLDP_RX_EVENT) } sd_lldp_rx_event_t; typedef void (*sd_lldp_rx_callback_t)(sd_lldp_rx *lldp_rx, sd_lldp_rx_event_t event, sd_lldp_neighbor *n, void *userdata); diff --git a/src/systemd/sd-lldp-tx.h b/src/systemd/sd-lldp-tx.h index 97ecd5e181..349a2716eb 100644 --- a/src/systemd/sd-lldp-tx.h +++ b/src/systemd/sd-lldp-tx.h @@ -31,13 +31,13 @@ _SD_BEGIN_DECLARATIONS; typedef struct sd_lldp_tx sd_lldp_tx; -typedef enum sd_lldp_multicast_mode_t { +__extension__ typedef enum sd_lldp_multicast_mode_t { SD_LLDP_MULTICAST_MODE_NEAREST_BRIDGE, SD_LLDP_MULTICAST_MODE_NON_TPMR_BRIDGE, SD_LLDP_MULTICAST_MODE_CUSTOMER_BRIDGE, _SD_LLDP_MULTICAST_MODE_MAX, _SD_LLDP_MULTICAST_MODE_INVALID = -EINVAL, - _SD_ENUM_FORCE_S64(LLDP_TX_MODE), + _SD_ENUM_FORCE_S64(LLDP_TX_MODE) } sd_lldp_multicast_mode_t; int sd_lldp_tx_new(sd_lldp_tx **ret); diff --git a/src/systemd/sd-lldp.h b/src/systemd/sd-lldp.h index c32d789476..b55c5512f9 100644 --- a/src/systemd/sd-lldp.h +++ b/src/systemd/sd-lldp.h @@ -34,7 +34,7 @@ enum { SD_LLDP_TYPE_SYSTEM_DESCRIPTION = 6, SD_LLDP_TYPE_SYSTEM_CAPABILITIES = 7, SD_LLDP_TYPE_MGMT_ADDRESS = 8, - SD_LLDP_TYPE_PRIVATE = 127, + SD_LLDP_TYPE_PRIVATE = 127 }; /* IEEE 802.1AB-2009 Clause 8.5.2: Chassis subtypes */ @@ -46,7 +46,7 @@ enum { SD_LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS = 4, SD_LLDP_CHASSIS_SUBTYPE_NETWORK_ADDRESS = 5, SD_LLDP_CHASSIS_SUBTYPE_INTERFACE_NAME = 6, - SD_LLDP_CHASSIS_SUBTYPE_LOCALLY_ASSIGNED = 7, + SD_LLDP_CHASSIS_SUBTYPE_LOCALLY_ASSIGNED = 7 }; /* IEEE 802.1AB-2009 Clause 8.5.3: Port subtype */ @@ -58,7 +58,7 @@ enum { SD_LLDP_PORT_SUBTYPE_NETWORK_ADDRESS = 4, SD_LLDP_PORT_SUBTYPE_INTERFACE_NAME = 5, SD_LLDP_PORT_SUBTYPE_AGENT_CIRCUIT_ID = 6, - SD_LLDP_PORT_SUBTYPE_LOCALLY_ASSIGNED = 7, + SD_LLDP_PORT_SUBTYPE_LOCALLY_ASSIGNED = 7 }; /* IEEE 802.1AB-2009 Clause 8.5.8: System capabilities */ @@ -73,7 +73,7 @@ enum { SD_LLDP_SYSTEM_CAPABILITIES_STATION = 1 << 7, SD_LLDP_SYSTEM_CAPABILITIES_CVLAN = 1 << 8, SD_LLDP_SYSTEM_CAPABILITIES_SVLAN = 1 << 9, - SD_LLDP_SYSTEM_CAPABILITIES_TPMR = 1 << 10, + SD_LLDP_SYSTEM_CAPABILITIES_TPMR = 1 << 10 }; #define SD_LLDP_SYSTEM_CAPABILITIES_ALL UINT16_MAX @@ -107,7 +107,7 @@ enum { SD_LLDP_OUI_802_1_SUBTYPE_PROTOCOL_IDENTITY = 4, SD_LLDP_OUI_802_1_SUBTYPE_VID_USAGE_DIGEST = 5, SD_LLDP_OUI_802_1_SUBTYPE_MANAGEMENT_VID = 6, - SD_LLDP_OUI_802_1_SUBTYPE_LINK_AGGREGATION = 7, + SD_LLDP_OUI_802_1_SUBTYPE_LINK_AGGREGATION = 7 }; /* IEEE 802.1AB-2009 Annex F */ @@ -115,7 +115,7 @@ enum { SD_LLDP_OUI_802_3_SUBTYPE_MAC_PHY_CONFIG_STATUS = 1, SD_LLDP_OUI_802_3_SUBTYPE_POWER_VIA_MDI = 2, SD_LLDP_OUI_802_3_SUBTYPE_LINK_AGGREGATION = 3, - SD_LLDP_OUI_802_3_SUBTYPE_MAXIMUM_FRAME_SIZE = 4, + SD_LLDP_OUI_802_3_SUBTYPE_MAXIMUM_FRAME_SIZE = 4 }; _SD_END_DECLARATIONS; diff --git a/src/systemd/sd-ndisc.h b/src/systemd/sd-ndisc.h index d39a6ddb31..8d457a51e7 100644 --- a/src/systemd/sd-ndisc.h +++ b/src/systemd/sd-ndisc.h @@ -42,25 +42,25 @@ enum { SD_NDISC_OPTION_RDNSS = 25, SD_NDISC_OPTION_FLAGS_EXTENSION = 26, SD_NDISC_OPTION_DNSSL = 31, - SD_NDISC_OPTION_CAPTIVE_PORTAL = 37, + SD_NDISC_OPTION_CAPTIVE_PORTAL = 37 }; /* Route preference, RFC 4191, Section 2.1 */ enum { SD_NDISC_PREFERENCE_LOW = 3U, SD_NDISC_PREFERENCE_MEDIUM = 0U, - SD_NDISC_PREFERENCE_HIGH = 1U, + SD_NDISC_PREFERENCE_HIGH = 1U }; typedef struct sd_ndisc sd_ndisc; typedef struct sd_ndisc_router sd_ndisc_router; -typedef enum sd_ndisc_event_t { +__extension__ typedef enum sd_ndisc_event_t { SD_NDISC_EVENT_TIMEOUT, SD_NDISC_EVENT_ROUTER, _SD_NDISC_EVENT_MAX, _SD_NDISC_EVENT_INVALID = -EINVAL, - _SD_ENUM_FORCE_S64(NDISC_EVENT), + _SD_ENUM_FORCE_S64(NDISC_EVENT) } sd_ndisc_event_t; typedef void (*sd_ndisc_callback_t)(sd_ndisc *nd, sd_ndisc_event_t event, sd_ndisc_router *rt, void *userdata); diff --git a/src/systemd/sd-path.h b/src/systemd/sd-path.h index 5f2f03c27b..80c2a672ec 100644 --- a/src/systemd/sd-path.h +++ b/src/systemd/sd-path.h @@ -110,7 +110,7 @@ enum { /* systemd-networkd search paths */ SD_PATH_SYSTEMD_SEARCH_NETWORK, - _SD_PATH_MAX, + _SD_PATH_MAX }; int sd_path_lookup(uint64_t type, const char *suffix, char **path); diff --git a/src/systemd/sd-resolve.h b/src/systemd/sd-resolve.h index 530bfd516e..96b974306d 100644 --- a/src/systemd/sd-resolve.h +++ b/src/systemd/sd-resolve.h @@ -47,7 +47,7 @@ typedef _sd_destroy_t sd_resolve_destroy_t; enum { SD_RESOLVE_GET_HOST = 1 << 0, SD_RESOLVE_GET_SERVICE = 1 << 1, - SD_RESOLVE_GET_BOTH = SD_RESOLVE_GET_HOST | SD_RESOLVE_GET_SERVICE, + SD_RESOLVE_GET_BOTH = SD_RESOLVE_GET_HOST | SD_RESOLVE_GET_SERVICE }; int sd_resolve_default(sd_resolve **ret); diff --git a/src/test/meson.build b/src/test/meson.build index 74da544a46..d9304d538b 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -211,7 +211,9 @@ tests += [ [files('test-mkdir.c')], - [files('test-json.c')], + [files('test-json.c'), + [], + [libm]], [files('test-modhex.c')], @@ -275,7 +277,9 @@ tests += [ [files('test-parse-helpers.c')], - [files('test-parse-util.c')], + [files('test-parse-util.c'), + [], + [libm]], [files('test-sysctl-util.c')], diff --git a/src/test/test-sd-hwdb.c b/src/test/test-sd-hwdb.c index 4251e2a809..8d08ea57af 100644 --- a/src/test/test-sd-hwdb.c +++ b/src/test/test-sd-hwdb.c @@ -5,6 +5,8 @@ #include "alloc-util.h" #include "errno-util.h" #include "errno.h" +#include "hwdb-internal.h" +#include "nulstr-util.h" #include "tests.h" TEST(failed_enumerate) { @@ -52,6 +54,24 @@ TEST(basic_enumerate) { assert_se(len1 == len2); } +TEST(sd_hwdb_new_from_path) { + _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; + const char *hwdb_bin_path = NULL; + int r; + + assert_se(sd_hwdb_new_from_path(NULL, &hwdb) == -EINVAL); + assert_se(sd_hwdb_new_from_path("", &hwdb) == -EINVAL); + assert_se(sd_hwdb_new_from_path("/path/that/should/not/exist", &hwdb) < 0); + + NULSTR_FOREACH(hwdb_bin_path, hwdb_bin_paths) { + r = sd_hwdb_new_from_path(hwdb_bin_path, &hwdb); + if (r >= 0) + break; + } + + assert_se(r >= 0); +} + static int intro(void) { _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; int r; diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c index 902d431d9a..1a753b836a 100644 --- a/src/test/test-string-util.c +++ b/src/test/test-string-util.c @@ -852,8 +852,8 @@ static void test_strverscmp_improved_newer(const char *older, const char *newer) TEST(strverscmp_improved) { static const char * const versions[] = { - "", "~1", + "", "ab", "abb", "abc", @@ -917,6 +917,29 @@ TEST(strverscmp_improved) { /* invalid characters */ assert_se(strverscmp_improved("123_aa2-67.89", "123aa+2-67.89") == 0); + /* some corner cases */ + assert_se(strverscmp_improved("123.", "123") > 0); /* One more version segment */ + assert_se(strverscmp_improved("12_3", "123") < 0); /* 12 < 123 */ + assert_se(strverscmp_improved("12_3", "12") > 0); /* 3 > '' */ + assert_se(strverscmp_improved("12_3", "12.3") > 0); /* 3 > '' */ + assert_se(strverscmp_improved("123.0", "123") > 0); /* 0 > '' */ + assert_se(strverscmp_improved("123_0", "123") > 0); /* 0 > '' */ + assert_se(strverscmp_improved("123..0", "123.0") < 0); /* '' < 0 */ + + /* empty strings or strings with ignored characters only */ + assert_se(strverscmp_improved("", NULL) == 0); + assert_se(strverscmp_improved(NULL, "") == 0); + assert_se(strverscmp_improved("0_", "0") == 0); + assert_se(strverscmp_improved("_0_", "0") == 0); + assert_se(strverscmp_improved("_0", "0") == 0); + assert_se(strverscmp_improved("0", "0___") == 0); + assert_se(strverscmp_improved("", "_") == 0); + assert_se(strverscmp_improved("_", "") == 0); + assert_se(strverscmp_improved("_", "_") == 0); + assert_se(strverscmp_improved("", "~") > 0); + assert_se(strverscmp_improved("~", "") < 0); + assert_se(strverscmp_improved("~", "~") == 0); + /* non-ASCII digits */ (void) setlocale(LC_NUMERIC, "ar_YE.utf8"); assert_se(strverscmp_improved("1٠١٢٣٤٥٦٧٨٩", "1") == 0); diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c index 162b3516b8..972cda129d 100644 --- a/src/udev/udevadm-hwdb.c +++ b/src/udev/udevadm-hwdb.c @@ -95,7 +95,7 @@ int hwdb_main(int argc, char *argv[], void *userdata) { } if (arg_test) - return hwdb_query(arg_test); + return hwdb_query(arg_test, NULL); return 0; } diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in index 7f1d052deb..a602b872e4 100644 --- a/sysusers.d/basic.conf.in +++ b/sysusers.d/basic.conf.in @@ -10,7 +10,7 @@ u root 0 "Super User" /root # The nobody user/group for NFS file systems g {{NOBODY_GROUP_NAME}} 65534 - - -u {{NOBODY_USER_NAME }} 65534:65534 "Nobody" - +u {{NOBODY_USER_NAME }} 65534:65534 "Kernel Overflow User" - # Administrator group: can *see* more than normal users g adm {{ADM_GID }} - - diff --git a/test/TEST-24-CRYPTSETUP/test.sh b/test/TEST-24-CRYPTSETUP/test.sh index 96d255dd96..b81b811654 100755 --- a/test/TEST-24-CRYPTSETUP/test.sh +++ b/test/TEST-24-CRYPTSETUP/test.sh @@ -10,6 +10,11 @@ TEST_FORCE_NEWIMAGE=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" +PART_UUID="deadbeef-dead-dead-beef-000000000000" +DM_NAME="test24_varcrypt" +KERNEL_APPEND+=" rd.luks=1 luks.name=$PART_UUID=$DM_NAME luks.key=$PART_UUID=/keyfile:LABEL=varcrypt_keydev" +QEMU_OPTIONS+=" -drive format=raw,cache=unsafe,file=${STATEDIR:?}/keydev.img" + check_result_qemu() { local ret=1 @@ -17,13 +22,13 @@ check_result_qemu() { [[ -e "${initdir:?}/testok" ]] && ret=0 [[ -f "$initdir/failed" ]] && cp -a "$initdir/failed" "${TESTDIR:?}" - cryptsetup luksOpen "${LOOPDEV:?}p2" varcrypt <"$TESTDIR/keyfile" - mount /dev/mapper/varcrypt "$initdir/var" + cryptsetup luksOpen "${LOOPDEV:?}p2" "${DM_NAME:?}" <"$TESTDIR/keyfile" + mount "/dev/mapper/$DM_NAME" "$initdir/var" save_journal "$initdir/var/log/journal" check_coverage_reports "${initdir:?}" || ret=5 _umount_dir "$initdir/var" _umount_dir "$initdir" - cryptsetup luksClose /dev/mapper/varcrypt + cryptsetup luksClose "/dev/mapper/$DM_NAME" [[ -f "$TESTDIR/failed" ]] && cat "$TESTDIR/failed" echo "${JOURNAL_LIST:-No journals were saved}" @@ -36,45 +41,65 @@ test_create_image() { create_empty_image_rootdir echo -n test >"${TESTDIR:?}/keyfile" - cryptsetup -q luksFormat --pbkdf pbkdf2 --pbkdf-force-iterations 1000 "${LOOPDEV:?}p2" "$TESTDIR/keyfile" - cryptsetup luksOpen "${LOOPDEV}p2" varcrypt <"$TESTDIR/keyfile" - mkfs.ext4 -L var /dev/mapper/varcrypt + cryptsetup -q luksFormat --uuid="$PART_UUID" --pbkdf pbkdf2 --pbkdf-force-iterations 1000 "${LOOPDEV:?}p2" "$TESTDIR/keyfile" + cryptsetup luksOpen "${LOOPDEV}p2" "${DM_NAME:?}" <"$TESTDIR/keyfile" + mkfs.ext4 -L var "/dev/mapper/$DM_NAME" mkdir -p "${initdir:?}/var" - mount /dev/mapper/varcrypt "$initdir/var" - - # Create what will eventually be our root filesystem onto an overlay - ( - LOG_LEVEL=5 - # shellcheck source=/dev/null - source <(udevadm info --export --query=env --name=/dev/mapper/varcrypt) - # shellcheck source=/dev/null - source <(udevadm info --export --query=env --name="${LOOPDEV}p2") - - setup_basic_environment - mask_supporting_services - - install_dmevent - generate_module_dependencies - cat >"$initdir/etc/crypttab" <<EOF -$DM_NAME UUID=$ID_FS_UUID /etc/varkey -EOF - echo -n test >"$initdir/etc/varkey" - ddebug <"$initdir/etc/crypttab" + mount "/dev/mapper/$DM_NAME" "$initdir/var" + + LOG_LEVEL=5 + + setup_basic_environment + mask_supporting_services + + install_dmevent + generate_module_dependencies + + # Create a keydev + dd if=/dev/zero of="${STATEDIR:?}/keydev.img" bs=1M count=16 + mkfs.ext4 -L varcrypt_keydev "$STATEDIR/keydev.img" + mkdir -p "$STATEDIR/keydev" + mount "$STATEDIR/keydev.img" "$STATEDIR/keydev" + echo -n test >"$STATEDIR/keydev/keyfile" + umount "$STATEDIR/keydev" - cat >>"$initdir/etc/fstab" <<EOF -/dev/mapper/varcrypt /var ext4 defaults 0 1 + cat >>"$initdir/etc/fstab" <<EOF +/dev/mapper/$DM_NAME /var ext4 defaults 0 1 EOF - # Forward journal messages to the console, so we have something - # to investigate even if we fail to mount the encrypted /var - echo ForwardToConsole=yes >> "$initdir/etc/systemd/journald.conf" - ) + # Forward journal messages to the console, so we have something + # to investigate even if we fail to mount the encrypted /var + echo ForwardToConsole=yes >> "$initdir/etc/systemd/journald.conf" + + # If $INITRD wasn't provided explicitly, generate a custom one with dm-crypt + # support + if [[ -z "$INITRD" ]]; then + INITRD="${TESTDIR:?}/initrd.img" + dinfo "Generating a custom initrd with dm-crypt support in '${INITRD:?}'" + + if command -v dracut >/dev/null; then + dracut --force --verbose --add crypt "$INITRD" + elif command -v mkinitcpio >/dev/null; then + mkinitcpio --addhooks sd-encrypt --generate "$INITRD" + elif command -v mkinitramfs >/dev/null; then + # The cryptroot hook is provided by the cryptsetup-initramfs package + if ! dpkg-query -s cryptsetup-initramfs; then + derror "Missing 'cryptsetup-initramfs' package for dm-crypt support in initrd" + return 1 + fi + + mkinitramfs -o "$INITRD" + else + dfatal "Unrecognized initrd generator, can't continue" + return 1 + fi + fi } cleanup_root_var() { ddebug "umount ${initdir:?}/var" mountpoint "$initdir/var" && umount "$initdir/var" - [[ -b /dev/mapper/varcrypt ]] && cryptsetup luksClose /dev/mapper/varcrypt + [[ -b "/dev/mapper/${DM_NAME:?}" ]] && cryptsetup luksClose "/dev/mapper/$DM_NAME" } test_cleanup() { diff --git a/test/fuzz/fuzz-bus-message/issue-23486-case-1 b/test/fuzz/fuzz-bus-message/issue-23486-case-1 Binary files differnew file mode 100644 index 0000000000..fe8338b42b --- /dev/null +++ b/test/fuzz/fuzz-bus-message/issue-23486-case-1 diff --git a/test/fuzz/fuzz-bus-message/issue-23486-case-2 b/test/fuzz/fuzz-bus-message/issue-23486-case-2 Binary files differnew file mode 100644 index 0000000000..1791244613 --- /dev/null +++ b/test/fuzz/fuzz-bus-message/issue-23486-case-2 diff --git a/test/fuzz/fuzz-bus-message/issue-23486-case-3 b/test/fuzz/fuzz-bus-message/issue-23486-case-3 Binary files differnew file mode 100644 index 0000000000..cff8b38037 --- /dev/null +++ b/test/fuzz/fuzz-bus-message/issue-23486-case-3 diff --git a/test/test-functions b/test/test-functions index 06a06e706a..daed481a29 100644 --- a/test/test-functions +++ b/test/test-functions @@ -337,6 +337,11 @@ qemu_min_version() { # Return 0 if qemu did run (then you must check the result state/logs for actual # success), or 1 if qemu is not available. run_qemu() { + # If the test provided its own initrd, use it (e.g. TEST-24) + if [[ -z "$INITRD" && -f "${TESTDIR:?}/initrd.img" ]]; then + INITRD="$TESTDIR/initrd.img" + fi + if [ -f /etc/machine-id ]; then read -r MACHINE_ID </etc/machine-id [ -z "$INITRD" ] && [ -e "$EFI_MOUNT/$MACHINE_ID/$KERNEL_VER/initrd" ] \ diff --git a/test/test-shutdown.py b/test/test-shutdown.py index d34e224942..77ac3a7d9f 100755 --- a/test/test-shutdown.py +++ b/test/test-shutdown.py @@ -4,9 +4,10 @@ import argparse import logging -import pexpect import sys +import pexpect + def run(args): @@ -21,7 +22,7 @@ def run(args): if args.verbose: console.logfile = sys.stdout - logger.debug("child pid %d" % console.pid) + logger.debug("child pid %d", console.pid) try: logger.info("waiting for login prompt") @@ -73,7 +74,7 @@ def run(args): logger.info("waiting for reboot") - console.expect('H login: ', 10) + console.expect('H login: ', 30) console.sendline('root') console.expect('bash.*# ', 10) @@ -88,13 +89,12 @@ def run(args): ret = 0 except Exception as e: logger.error(e) - logger.info("killing child pid %d" % console.pid) + logger.info("killing child pid %d", console.pid) console.terminate() return ret - -if __name__ == '__main__': +def main(): parser = argparse.ArgumentParser(description='test logind shutdown feature') parser.add_argument("-v", "--verbose", action="store_true", help="verbose") parser.add_argument("command", help="command to run") @@ -109,6 +109,9 @@ if __name__ == '__main__': logging.basicConfig(level=level) - sys.exit(run(args)) + return run(args) + +if __name__ == '__main__': + sys.exit(main()) # vim: sw=4 et diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh index 0e8f92937e..793411ed84 100755 --- a/tools/oss-fuzz.sh +++ b/tools/oss-fuzz.sh @@ -34,9 +34,13 @@ else apt-get update apt-get install -y gperf m4 gettext python3-pip \ - libcap-dev libmount-dev libkmod-dev \ + libcap-dev libmount-dev \ pkg-config wget python3-jinja2 zipmerge + if [[ "$ARCHITECTURE" == i386 ]]; then + apt-get install -y pkg-config:i386 libcap-dev:i386 libmount-dev:i386 + fi + # gnu-efi is installed here to enable -Dgnu-efi behind which fuzz-bcd # is hidden. It isn't linked against efi. It doesn't # even include "efi.h" because "bcd.c" can work in "unit test" mode @@ -105,6 +109,22 @@ install -Dt "$OUT/src/shared/" \ "$build"/src/shared/libsystemd-shared-*.so \ "$build"/src/core/libsystemd-core-*.so +# Most i386 libraries have to be brought to the runtime environment somehow. Ideally they +# should be linked statically but since it isn't possible another way to keep them close +# to the fuzz targets is used here. The dependencies are copied to "$OUT/src/shared" and +# then `rpath` is tweaked to make it possible for the linker to find them there. "$OUT/src/shared" +# is chosen because the runtime search path of all the fuzz targets already points to it +# to load "libsystemd-shared" and "libsystemd-core". Stuff like that should be avoided on +# x86_64 because it tends to break coverage reports, fuzz-introspector, CIFuzz and so on. +if [[ "$ARCHITECTURE" == i386 ]]; then + for lib_path in $(ldd "$OUT"/src/shared/libsystemd-shared-*.so | perl -lne 'print $1 if m{=>\s+(/lib\S+)}'); do + lib_name=$(basename "$lib_path") + cp "$lib_path" "$OUT/src/shared" + patchelf --set-rpath \$ORIGIN "$OUT/src/shared/$lib_name" + done + patchelf --set-rpath \$ORIGIN "$OUT"/src/shared/libsystemd-shared-*.so +fi + wget -O "$OUT/fuzz-json.dict" https://raw.githubusercontent.com/rc0r/afl-fuzz/master/dictionaries/json.dict find "$build" -maxdepth 1 -type f -executable -name "fuzz-*" -exec mv {} "$OUT" \; |