1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-05 09:17:44 +03:00
Commit Graph

36753 Commits

Author SHA1 Message Date
Zbigniew Jędrzejewski-Szmek
944d8d9050 policy files: adjust landing page link
(cherry picked from commit d6e2c1ab71)
2022-01-12 22:10:55 +01:00
yangmingtai
32f33c9474 fix test-string-util failed when locale is not utf8
(cherry picked from commit 647082cf7f)
2022-01-12 22:09:36 +01:00
Zbigniew Jędrzejewski-Szmek
27d141acdf nss: only read logging config from environment variables
log_parse_environment() uses should_parse_proc_cmdline() to determine whether
it should parse settings from the kernel command line. But the checks that
should_parse_proc_cmdline() apply to the whole process, and we could get a positive
answer also when log_parse_environment() was called from one of the nss modules.
In case of nss-modules, we don't want to look at the kernel command line.

log_parse_environment_variables() that only looks at the environment variables
is split out and used in the nss modules.

Fixes #22020.

(cherry picked from commit a7d15a2465)
2022-01-11 20:31:54 +01:00
Zbigniew Jędrzejewski-Szmek
2176cec5ec nss: drop dummy setup_logging() helpers
log_parse_environment() stopped being a macro in 9fdee66f2d.
As reported by @bauen1 in https://github.com/systemd/systemd/issues/22020,
the comment was out of date.

(cherry picked from commit 56a5f4969b)
2022-01-11 20:31:51 +01:00
Zbigniew Jędrzejewski-Szmek
96826c48ad bootctl: do not update sd-boot if it wasn't installed in the first place
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2038289.

(cherry picked from commit 49927ad813)
2022-01-11 20:31:42 +01:00
Zbigniew Jędrzejewski-Szmek
527c9002b5 bootctl: split out the check whether sd-boot is installed
(cherry picked from commit d9f048b5d1)
2022-01-11 20:31:34 +01:00
Jan Janssen
e9a0404b76 boot: Fix readdir_harder() on VirtualBox
Fixes: #22073
(cherry picked from commit ed3abbfbde)
2022-01-11 20:30:40 +01:00
Julia Kartseva
617c67a039 bpf: fix bpf_can_link_lsm_program condition
Since bpf_can_link_lsm_program return value is boolean, the expression
`r < 0` is always false.

(cherry picked from commit ccfc534dee)
2022-01-10 21:47:30 +01:00
Julia Kartseva
f9370f9188 bpf: check if lsm link ptr is libbpf error
BPF_RAW_TRACEPOINT_OPEN is expected to work only on x86 and x86_64,
since BPF trampoline is implemented only on these architectures.

Attach probing by bpf_program__attach_lsm already happens in
`bpf_lsm_supported`. The resulting pointer can store libbpf error and
that is the case for unsupported architectures.
Add libbpf error check to `bpf_lsm_supported` so execution does not
reach the point where unit startup fails.

(cherry picked from commit f409aa5c63)
2022-01-10 21:47:21 +01:00
Zbigniew Jędrzejewski-Szmek
911516e161 shared/rm-rf: loop over nested directories instead of instead of recursing
To remove directory structures, we need to remove the innermost items first,
and then recursively remove higher-level directories. We would recursively
descend into directories and invoke rm_rf_children and rm_rm_children_inner.
This is problematic when too many directories are nested.

Instead, let's create a "TODO" queue. In the the queue, for each level we
hold the DIR* object we were working on, and the name of the directory. This
allows us to leave a partially-processed directory, and restart the removal
loop one level down. When done with the inner directory, we use the name to
unlinkat() it from the parent, and proceed with the removal of other items.

Because the nesting is increased by one level, it is best to view this patch
with -b/--ignore-space-change.

This fixes CVE-2021-3997, https://bugzilla.redhat.com/show_bug.cgi?id=2024639.
The issue was reported and patches reviewed by Qualys Team.
Mauro Matteo Cascella and Riccardo Schirone from Red Hat handled the disclosure.

(cherry picked from commit 5b1cf7a9be)
2022-01-10 21:47:03 +01:00
Zbigniew Jędrzejewski-Szmek
664529efa9 shared/rm_rf: refactor rm_rf() to shorten code a bit
(cherry picked from commit 84ced33002)
2022-01-10 21:47:00 +01:00
Zbigniew Jędrzejewski-Szmek
47741ff9ea shared/rm_rf: refactor rm_rf_children_inner() to shorten code a bit
(cherry picked from commit 3bac86abfa)
2022-01-10 21:46:56 +01:00
Ludwig Nussel
1d5687278c systemctl: Fix --show timestamp
(cherry picked from commit 2dbb54788e)
2022-01-10 21:46:34 +01:00
Jan Janssen
3c5c13f82c boot-timestamps: Discard firmware init time when running in a VM
Fixes: #22060
(cherry picked from commit f699bd81e8)
2022-01-09 21:27:07 +01:00
Zbigniew Jędrzejewski-Szmek
8ec64d0778 bpf: actually skip RestrictFileSystems= when not supported
Units would fail to start, incl. systemd-journald.service and systemd-udevd.service.
Since unit->manager->restrict_fs will be set if and only if we can use it,
we can just check for that and remove the other checks.
Follow-up for 299d941723.

(cherry picked from commit 46004616a1)
2022-01-09 21:26:58 +01:00
Zbigniew Jędrzejewski-Szmek
d08f6ff204 seccomp: move arch_prctl to @default
It was reported as used by the linker:

> [It is] called in the setup of ld-linux-x86-64.so.2 from _dl_sysdep_start.
> My local call stack (with LTO):
>
> #0 init_cpu_features.constprop.0 (/usr/lib64/ld-linux-x86-64.so.2)
> #1 _dl_sysdep_start (/usr/lib64/ld-linux-x86-64.so.2)
> #2 _dl_start (/usr/lib64/ld-linux-x86-64.so.2)
> #3 _start (/usr/lib64/ld-linux-x86-64.so.2)
>
> Looking through the source, I think it's this (links for glibc 2.34):
> - First dl_platform_init calls _dl_x86_init_cpu_features, a wrapper for init_cpu_features.
> - Then init_cpu_features calls get_cet_status.
> - At last, get_cet_status invokes arch_prctl.

Fixes #22033.

(cherry picked from commit 5f02870a74)
2022-01-07 17:41:17 +01:00
Yu Watanabe
41134e766a fstab-generator: also skip other network filesystems and live image
(cherry picked from commit 155e1bb4e7)
2022-01-07 16:02:50 +01:00
Yu Watanabe
7ca41c509e fstab-generator: skip root directory handling when nfsroot is requested
Fixes RHBZ#2037233 (https://bugzilla.redhat.com/show_bug.cgi?id=2037233).

(cherry picked from commit 77b8e92de8)
2022-01-07 16:02:46 +01:00
Adam Williamson
d0e98b7a12 kernel-install: prefer /boot over /boot/efi for $BOOT_ROOT
This restores the preference order from before 9e82a74. The code
previous to that change 'preferred' /boot over /boot/efi; that
commit changed it to check /boot/efi before checking /boot.
Changing this precedence could (and did, for me) have unexpected
effects - it seems safer to leave it how it was.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
(cherry picked from commit a5307e173b)
2022-01-07 16:00:24 +01:00
Yu Watanabe
7a003166fb udev-util: ignore USB-C ports in power source mode when detecting system is running on AC power
Fixes #21988.

(cherry picked from commit 795e86b4f1)
2022-01-07 15:59:30 +01:00
Yu Watanabe
dbfaed242e udev-util: re-implement on_ac_power() with sd-device
(cherry picked from commit 01d4ad3bde)
2022-01-07 15:59:25 +01:00
Yu Watanabe
435bd3077a util: move on_ac_power() from util.c -> udev-util.c
(cherry picked from commit 06795b02e3)
2022-01-07 15:59:23 +01:00
Julia Kartseva
95a43a476f bpf: do not freeze if bpf lsm fails to set up
BPF LSM is cgroup unaware and it's set up is happening in core manager.
It occures that the current implementation is too restrictive and causes
pid 1 to freeze.
Instead:
* in bpf_lsm_setup set manager->restrict_fs pointer last,
so it is an indicator that the set up was successful
* check for manager->restrict_fs before applying unit options

(cherry picked from commit 299d941723)
2022-01-07 15:59:13 +01:00
Zbigniew Jędrzejewski-Szmek
428425ddc6 core/bpf: tighten handling of return values, improve messages
The code was written unidiomatically, using r as a boolean value, and
confusing errno and r in some places. AFAICS, there wasn't any actual
problem: even in the one place where errno was used instead of r, it would
almost certainly be initialized.

It seems that some libbpf functions set errno, while others return the
error, possibly encoded. Since there are almost no docs, the only way to
know is to read the code of the function. To make matters worse, there is
a global libbpf_mode which can be set to change the convention. With
LIBBPF_STRICT_DIRECT_ERRS in libbpf_mode, some functions set errno while others
return a negative error, and the only way to know is to read the code, except
that the split is now different. We currently don't set
LIBBPF_STRICT_DIRECT_ERRS, but even the possibility makes everything harder
to grok.

This is all very error-prone. Let's at least add some asserts to make sure that
the returned values are as expected.

(cherry picked from commit b7cba81553)
2022-01-07 15:59:10 +01:00
Zbigniew Jędrzejewski-Szmek
75dac89443 core/bpf: avoid unnecessary initialization of variables, tighten scope
No funtional change.

(cherry picked from commit 92698b0f9e)
2022-01-07 15:59:07 +01:00
Pigmy-penguin
c33d10d230 userdbctl: fix "Password OK" shown even when password is empty or locked (#21308)
userdbctl: fix "Password OK" shown even when password is empty or locked
(cherry picked from commit cd933f14bd)
2022-01-07 15:55:31 +01:00
Mike Gilbert
4c0ed19c52 test-watchdog: mark as unsafe
If something goes wrong with this test it may result in an unsafe
system restart. Let's avoid running it automatically.

See https://github.com/systemd/systemd/issues/22001.

(cherry picked from commit 70652c2a6f)
2022-01-07 15:54:12 +01:00
Zbigniew Jędrzejewski-Szmek
fb9bbbee6a logind: do not propagate error in delayed action
If the action failed, we should log about the issue, and continue.
Exiting would bring the graphical session down, which of course is not
appreciated by users.

As documented in previous commits, a non-negative return from the callback
doesn't matter, so the callback is simplified a bit.

Fixes #21991.

(cherry picked from commit 8207b8321b)
2022-01-07 15:53:45 +01:00
Daan De Meyer
c86461782f journal: Log filename when we fail to write an entry
(cherry picked from commit 5b4a634a03)
2022-01-07 15:53:17 +01:00
Daan De Meyer
bdaa1b2dda journal: Log a better message when we're rotating because a file is full
The previous message was confusing errors. When we're rotating because
we've reached the file size limit, let's log a better message.

Fixes #22007.

(cherry picked from commit eff79e4e22)
2022-01-07 15:53:12 +01:00
Yu Watanabe
b4c57e1b1c backlight: ignore error if the backlight device is already removed
Fixes #21997.

(cherry picked from commit f0f6508783)
2022-01-07 15:52:33 +01:00
Yu Watanabe
80f1b9ab54 test-repart: append /sbin and /usr/sbin to $PATH= to make sfdisk can be found
Fixes #21972.

(cherry picked from commit 329a5b91d9)
2022-01-07 15:52:26 +01:00
Yu Watanabe
6f1f99a35d test-repart: disable pager
(cherry picked from commit 31cf58864d)
2022-01-07 15:52:25 +01:00
Yu Watanabe
0e29d6ef44 sd-boot: select newest kernel entry matching with the default glob pattern
This fixes a bug introduced by 0c674ce5f2.

Fixes #22004.

(cherry picked from commit e37d30f334)
2022-01-07 15:51:51 +01:00
Yu Watanabe
7b2f8845cd resolve: add missing initialization of libgcrypt
Fixes #21951.

(cherry picked from commit e28df39269)
2022-01-07 15:51:46 +01:00
Zbigniew Jędrzejewski-Szmek
0776365d77 meson: generate better arch defines for clang bpf compilation
The code assume that meson's cpu_family can be mapped directly to
'-D__<cpu_family>__'. This works in a surprising number of cases, but not for a
few architectures. PPC uses "powerpc", and RISC-V omits the trailing underscores.
ARM and RISC-V require a second define too.

Fixes #21900.

(I don't think this matters too much: we need *something* so that gnu/stubs.h
can be successfully included. But we don't actually call syscalls or depend too
much on the host environment, so things should be fine as long as we don't get
a compilation error.)

(cherry picked from commit e897b07f97)
2022-01-04 16:28:31 +01:00
Zbigniew Jędrzejewski-Szmek
cd686fe4c7 basic/log: allow errno values higher than 255
When the support for "synthetic errno" was added, we started truncating
the errno value to just the least significant byte. This is generally OK,
because errno values are defined up to ~130.

The docs don't really say what the maximum value is. But at least in principle
higher values could be added in the future. So let's stop truncating
the values needlessly.

The kernel (or libbpf?) have an error where they return 524 as an errno
value (https://bugzilla.redhat.com/show_bug.cgi?id=2036145). We would
confusingly truncate this to 12 (ENOMEM). It seems much nicer to let
strerror() give us "Unknown error 524" rather than to print the bogus
message about ENOMEM.

(cherry picked from commit 5f74fcd41c)
2022-01-04 16:27:57 +01:00
Zbigniew Jędrzejewski-Szmek
e4d4c5f9ee coredump: do not crash if we failed to acquire exe path
The COREDUMP_EXE attribute is "optional", i.e. we continue to process the
crash even if we didn't acquire it. The coredump generation code assumed
that it is always available:

 #5 endswith at ../src/fundamental/string-util-fundamental.c:41
 [ endswith() is called with NULL here, and an assertion fails. ]
 #6 submit_coredump at ../src/coredump/coredump.c:823
 #7 process_socket at ../src/coredump/coredump.c:1038
 #8 run at ../src/coredump/coredump.c:1413

We use the exe path for loop detection, and also (ultimately) pass it to
dwfl_core_file_report(). The latter seems to be fine will NULL, so let's just
change our code to look at COMM, which should be more reliable anyway.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2036517.

(cherry picked from commit c790632cab)
2022-01-04 16:27:51 +01:00
Yu Watanabe
bdcc3b0713 elf-util: add missing assertion
(cherry picked from commit 80b241f2ec)
2022-01-04 16:27:41 +01:00
Yu Watanabe
72f95a1342 elf-util: executable argument for parse_elf() may be NULL
Fixes assertion triggered by parse_package_metadata() and json_build().

(cherry picked from commit d090049c01)
2022-01-04 16:27:14 +01:00
Yu Watanabe
9f5372ce4c hostname-util: drop GET_HOSTNAME_ALLOW_NONE flag and always refuse "(none)"
The flag is now only used in test-sysctl-util.c, and it should be
replaced with uname(), because of the same reason as the previous
commit.

(cherry picked from commit 9383fa08bd)
2022-01-04 16:25:46 +01:00
Yu Watanabe
7c78994860 hostname-setup: gracefully handle kernel with empty CONFIG_DEFAULT_HOSTNAME
Previously, sethostname_idempotent_full() calls gethostname_full() with
GET_HOSTNAME_ALLOW_NONE and GET_HOSTNAME_ALLOW_LOCALHOST flags. That
intended to get any values set by kernel. But, that does not work, as
the hostname may be empty.

Let's simplify the logic. The function sethostname_idempotent_full()
intends to set the requested hostname only when the current hostname
is different from the requested one. So, no check in getostname_full()
is required. Hence, simply use the result of uname() here.

Fixes #21896.

(cherry picked from commit d8d6b2275f)
2022-01-04 16:25:42 +01:00
Jan Janssen
1c4c566d86 boot: Do not warn if an initializing driver returns EFI_ABORTED
Fixes: #21965
(cherry picked from commit 8fb16fee96)
2022-01-04 16:25:33 +01:00
Yu Watanabe
c563e3ef77 seccomp-util: include missing_syscall_def.h to make __SNR_foo mapped to __NR_foo
Fixes #21969.

(cherry picked from commit e83156c264)
2022-01-04 16:24:48 +01:00
Yu Watanabe
cd88d010e8 missing-syscall: add __NR_openat2
(cherry picked from commit d96ad9e8cb)
2022-01-04 16:24:47 +01:00
Yu Watanabe
7e33887657 syscalls: update syscall definitions
(cherry picked from commit 0c718b1a67)
2022-01-04 16:24:46 +01:00
Jan Janssen
2c99c39936 boot: Use objcopy to align sections
Not aligning these can create gaps in the section table. Some
firmware does not handle this nicely resulting in secure boot
signature fails.
Using objcopy ensures that any new sections in the future will be
properly aligned.

Fixes: #21956
(cherry picked from commit 75747c8a39)
2022-01-04 16:24:16 +01:00
Yu Watanabe
a473bfb433 nss-myhostname: do not apply non-zero offset to null pointer
Fixes https://github.com/systemd/systemd/issues/21935#issuecomment-1003216503.

(cherry picked from commit 92e9df9ca0)
2022-01-04 16:23:35 +01:00
Yu Watanabe
9c8bc0451a nss-systemd: fix alignment of gr_mem
Follow-up for 1e65eb8f9b.

Fixes #21935.

(cherry picked from commit 420a35c1fa)
2022-01-04 16:23:29 +01:00
Yu Watanabe
cd76e5956a udev: fix ID_NET_NAME_MAC= udev property
This fixes a bug introduced by eaba9bb3e6.

The commit mistakenly drops 'x' in ID_NET_NAME_MAC, and adds colons.
The colons were dropped by the commit dfa4876c41,
but the missing 'x' was not added at that time.

Follow-up for dfa4876c41.

(cherry picked from commit 60e930fc3e)
2022-01-04 16:22:41 +01:00