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

58488 Commits

Author SHA1 Message Date
msizanoen1
dfa043ae1f escape: Ensure that output is always valid UTF-8
This ensures that shell string escape operations will not produce output
with invalid UTF-8 from the input by escaping invalid UTF-8 data as if
they were single byte characters.

(cherry picked from commit 00f57157f3)
(cherry picked from commit e906fd2421)
(cherry picked from commit e0a674f7f8)
2023-03-03 15:40:26 +01:00
Frantisek Sumsal
085795656a virt: correctly detect QEMU emulated pSeries guests
Resolves: #26629
(cherry picked from commit 8c7a6c742a)
(cherry picked from commit 1a22006574)
(cherry picked from commit 48911dc5ec)
2023-03-03 15:40:22 +01:00
Lennart Poettering
cb4f512f47 psi-util: fix error handling
We checked ERRNO_IS_NOT_SUPPORTED on a possible positive non-error code,
which isn't right.

Fix that. Also add caching, since we are about to call this more often.

(cherry picked from commit 90ec8ebe33)
(cherry picked from commit 5ee19fdfa0)
(cherry picked from commit 8e6234064d)
2023-03-03 15:40:17 +01:00
David Tardon
407726df07 systemctl: print better message if default target is masked
If the default target is masked, `systemctl get-default` prints

  Failed to get default target: Operation not possible due to RF-kill

That's a bit too cryptic, so let's make it clear what's actually
happening.

Fixes #26589.

(cherry picked from commit 7c78a19322)
(cherry picked from commit 144ac494ec)
(cherry picked from commit 30eae23c4a)
2023-03-03 15:40:10 +01:00
Lennart Poettering
09174303d1 man: add two missing commands to synopsys
(cherry picked from commit aff131775b)
(cherry picked from commit dc98d58dd8)
(cherry picked from commit 7d3af1ff11)
2023-03-03 15:40:05 +01:00
Yu Watanabe
1a4634b6f4 core/dbus-socket: check the socket path is absolute
In config_parse_socket_listen(), we have checked the path is absolute,
however we have not in the dbus method.

(cherry picked from commit 4de2b47bde)
(cherry picked from commit e093acd062)
(cherry picked from commit 22d1f01b05)
2023-03-03 15:40:02 +01:00
Yu Watanabe
8be4af4204 sd-event: fix error handling
Follow-up for 6d2326e036.

(cherry picked from commit 1912f790fe)
(cherry picked from commit a719c2ec2f)
(cherry picked from commit dd6561ff3e)
2023-03-03 15:39:58 +01:00
Yu Watanabe
ac04d804c3 sd-event: always initialize sd_event.perturb
If the boot ID cannot be obtained, let's first fallback to the machine
ID, and if still cannot, then let's use 0.
Otherwise, no timer event source cannot be triggered.

Fixes #26549.

(cherry picked from commit 6d2326e036)
(cherry picked from commit 58c821af60)
(cherry picked from commit 78976199b2)
2023-03-03 15:39:57 +01:00
Yu Watanabe
e385eb57dc systemctl: show "Until:" field only for service and scope units
Only service and scope units have RuntimeMaxUSec bus property.
To suppress the "Until:" field for other unit types, the entry must be
initialized with USEC_INFINITY.

Fixes #26473.

(cherry picked from commit b59052be26)
(cherry picked from commit 2bfb07b22f)
(cherry picked from commit 028cee00dd)
2023-03-03 15:39:44 +01:00
Zbigniew Jędrzejewski-Szmek
3339b23f4c tmpfiles.d: drop misleading comment
I'm not sure what "suffix" was meant by this comment, but the file has the usual suffix.
The file was added with the current name back in c4708f1323.
Maybe an earlier version of the patch did something different.

(cherry picked from commit 9c7188547c)
(cherry picked from commit d9abd8babe)
(cherry picked from commit 2ca2390b11)
2023-03-03 15:39:38 +01:00
Zbigniew Jędrzejewski-Szmek
c68ae31edb efi: drop executable-stack bit from .elf file
An rpminspect test in Fedora/RHEL is flagging our stub files as having an
executable stack. The check is correct:

$ readelf --wide --program-headers build/src/boot/efi/linuxx64.elf.stub | rg -i stack
  GNU_STACK      0x000000 0x0000000000000000 0x0000000000000000 0x000000 0x000000 RWE 0x10

It seems to be just an omission in the linker script… None of the objects that
are linked into the stub are marked as requiring an executable stack:

$ readelf --wide --sections build/src/boot/efi/*.c.o \
  /usr/lib/gnuefi/x64/libgnuefi.a \
  /usr/lib/gnuefi/x64/libefi.a \
  /usr/lib/gcc/x86_64-redhat-linux/12/libgcc.a \
  | rg '.note.GNU-stack.*X'
(nothing)

On aarch64 we end up with a nonexecutable stack, but on ia32 and x64 we get one,
so this might be just a matter of defaults in the linker. It doesn't matter
greatly, but let's mark the stack as non-executable to avoid the warning.

Note: '-Wl,-z' is not needed, things work with just '-z'.
(cherry picked from commit 1eca770933)
(cherry picked from commit 44c2ff5b1e)
(cherry picked from commit 4f4344e3a5)
2023-03-03 15:39:21 +01:00
Lennart Poettering
73fd236311 homectl: add missing break
(cherry picked from commit 464ec1dec7)
(cherry picked from commit eae11e3f06)
(cherry picked from commit 8af5e945c7)
2023-03-03 15:38:21 +01:00
Zbigniew Jędrzejewski-Szmek
88302d7f84 man/tmpfiles.d: adjust the table in synopsis, improve spelling
r and R take globs, so let's name the argument appropriately in the tl;dr listing.

Also, use 'clean-up' in the file name where it represents the verb "clean up",
and other minor spelling adjustments.

(cherry picked from commit 164297cd9a)
(cherry picked from commit aac692160e)
(cherry picked from commit e72f1676af)
2023-03-03 15:38:12 +01:00
Yu Watanabe
bfbd75cf87 process-util: show requested process name in the log
This is useful for debugging issues like #26474.

(cherry picked from commit b9fadf2e2c)
(cherry picked from commit ba1cb4156b)
(cherry picked from commit 892fe5d204)
2023-03-03 15:37:33 +01:00
Mike Yuan
a90a4560ff journalctl: fix output when --lines is used with --grep
Previously, we skip the entries before arg_lines
unconditionally, which doesn't behave correctly
when used with --grep. After this commit, when
a pattern is specified, we don't skip the entries
early, but rely on the count of the lines shown
to tell us when to stop. To achieve that we would
have to search backwards instead.

Fixes #25147

(cherry picked from commit db4691961c)
(cherry picked from commit c4cdbb978f)
(cherry picked from commit e9889190be)
2023-03-03 15:37:27 +01:00
Jan Janssen
2cf90e13f5 boot: Fix assertion failure
The TPM code expects a description unless the PCR index indicates that
no measurements have to take place. The assert was preempting this
check from happening.

Fixes: #26428
(cherry picked from commit f92428eae5)
(cherry picked from commit cd5de2811a)
(cherry picked from commit ac3d8922df)
2023-03-03 15:36:41 +01:00
Lennart Poettering
292debc981 pid1: generate compat warning for SystemCallArchitectures= if seccomp is off
(cherry picked from commit 6aa2c55522)
(cherry picked from commit 01b90e1588)
(cherry picked from commit 7c9b9c8d93)
2023-03-03 15:36:37 +01:00
Yu Watanabe
4647e86922 core/mount: fix default target for /sysusr/usr and its child
Follow-up for 29a24ab28e.

(cherry picked from commit dbfc096095)
(cherry picked from commit a3177cbe54)
(cherry picked from commit 6e8d76f776)
2023-03-03 15:36:32 +01:00
Joan Bruguera
5f6a369a6a resolved: Fall back to TCP if UDP is blocked
If UDP is blocked on the system (e.g. by iptables or BPF), the kernel will
return EPERM on some or all of the system calls (connect, sendmsg, etc.).
In this case, try to fall back to TCP, which hopefully will not be blocked.

(cherry picked from commit 3dd6336ad0)
(cherry picked from commit a88e35bf95)
(cherry picked from commit 58cbb7a89b)
2023-03-03 15:36:21 +01:00
Marcus Schäfer
fa71bb7bce Handle MACHINE_ID=uninitialized
systemd supports /etc/machine-id to be set to: uninitialized
In this case the expectation is that systemd creates a new
machine ID and replaces the value 'uninitialized' with the
effective machine id. In the scope of kernel-install we
should also enforce the creation of a new machine id in this
condition

(cherry picked from commit 305dd91adf)
(cherry picked from commit 132f0ec7de)

Backported for https://bugzilla.redhat.com/show_bug.cgi?id=2148464.
2023-03-03 15:36:04 +01:00
Marcus Schäfer
7f18d82308 Fix reading /etc/machine-id in kernel-install (#25388)
The kernel-install script has code to read the contents of
/etc/machine-id into the MACHINE_ID variable. Depending
on the variable content kernel-install either logs the
value or creates a new machine id via 'systemd-id128 new'.
In that logic there is one issue. If the file /etc/machine-id
exists but is empty, the script tries to call read on an
empty file which return with an exit code != 0. As the
script code also uses 'set -e', kernel-install will exit at
this point which is unexpected.

The condition of an empty /etc/machine-id file exists for
example when building OS images, which should initialize the
system id on first boot but not staticly inside of the image.
afaik an empty /etc/machine-id is also a common approach
to make systemd indicate that it should create a new system
id. Because of this, the commit makes sure the reading of
/etc/machine-id does not fail in any case such that the
handling of the MACHINE_ID variable takes place.

(cherry picked from commit 883e7cbfc0)
(cherry picked from commit d34ea410f4)

Backported for https://bugzilla.redhat.com/show_bug.cgi?id=2148464.
2023-03-03 15:35:45 +01:00
наб
a1addcf47d shellcheck-clean kernel-install again
(cherry picked from commit 35339eb88c)
2023-03-03 15:31:25 +01:00
Yu Watanabe
f32581ac80 sysusers: also add root group
Follow-up for 49bb7fe5f8.

Fixes an issue reported at
https://github.com/systemd/systemd/pull/26270#issuecomment-1428945403.

(cherry picked from commit 9361a712f8)
(cherry picked from commit e91a304274)
2023-02-16 20:58:20 +00:00
Daan De Meyer
18a2aaf2f6 test-boot-timestamp: Handle ERANGE error
Timestampfs from sysfs files can be zero in which case ERANGE will
be returned so let's make sure we catch that.

(cherry picked from commit 0da4cc97b4)
(cherry picked from commit ef96e60f18)
2023-02-16 10:46:26 +00:00
ml
067b5b7e89 man: fix directory for user home bind mounts
(cherry picked from commit f39d7d00a3)
(cherry picked from commit bfaf02348e)
2023-02-16 10:46:26 +00:00
ml
3a44be9ad0 nspawn: fix directory in logged error
(cherry picked from commit 7b03b44ed9)
(cherry picked from commit cad1e9c53d)
2023-02-16 10:46:26 +00:00
Lennart Poettering
bfe6d1d197 core: when isolating to a unit, also keep units running that are triggered by units we keep running
Inspired by: #26364

(this might even "fix" #26364, but without debug logs it's hard to make
such claims)

Fixes: #23055
(cherry picked from commit 32d6707dd1)
(cherry picked from commit c973e2295c)
2023-02-13 14:50:14 +00:00
Samuel Cabrero
132e153b90 userdb: Use json_dispatch_user_group_name() to parse GetMembership fields
It allows to relax the checks and allow characters like '\', used by
windows to split the domain name and user name.

For reference, discussion in the systemd-devel mailing list:
https://lists.freedesktop.org/archives/systemd-devel/2023-February/048804.html

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
(cherry picked from commit edd5ec2373)
(cherry picked from commit 68d11465e4)
2023-02-13 14:50:14 +00:00
Luca Boccassi
facb134183 README: explicitly note that util-linux's mount/swap are required
These are the most visible and hard requirements, as we use options that
busybox does not provide, so list them explicitly to avoid surprises

(cherry picked from commit 164070e497)
(cherry picked from commit 0dc9f7335d)
2023-02-13 14:50:14 +00:00
Zbigniew Jędrzejewski-Szmek
a05470812a man: fix section number
Fixes #26376.

(cherry picked from commit 359c14368e)
(cherry picked from commit ebada36b7b)
2023-02-13 14:50:14 +00:00
Daan De Meyer
c08e9e0e32 bootctl: Add missing %m
(cherry picked from commit 3b42ffe590)
(cherry picked from commit 601d8564b3)
2023-02-13 14:50:14 +00:00
Zbigniew Jędrzejewski-Szmek
a71be850b5 manager: "downgrade" message about command vanishing from the unit file
We would print "Current command vanished from the unit file, execution of
the command list won't be resumed." as a warning, but most of the time there
is nothing to resume, because a unit has just one command. So let's detect
the case where the command that was active is the last command in the sequence
and skip the warning.

I was considering how to store the information that the command is last. An
important consideration is not to use a format that would confuse older versions
of systemd. (It wouldn't be a big problem if older systemd just refused the
new serialization, since we require systemd to be newer, but we should avoid
the case where the deserialization is "successful", but actually incorrect.)
Similarly, the deserialization from the old systemd must not confuse new systemd.
For this command, we have a list of arguments at the end, so just adding a
new field either in the middle or at the end is problematic because it's hard
to ensure that we don't mix up the positional and variable arguments.

We actually need to store just one bit of information, so '+' is prefixed on
the index of the last command and used by new systemd to skip the warning.
When deserializing from older systemd, '+' is not present, so we detect all
commands as "not last", and still emit the warning, so we err on the side of
caution. If the user were to deserialize from newer to older systemd, nothing
untoward would happen, because the '+' is ignored. (Users shouldn't do this,
but we know that this occasionally happens with initrds or exitrds and package
downgrades.)

(cherry picked from commit a99bd455b5)
(cherry picked from commit 9bb72a4e96)
2023-02-13 14:50:14 +00:00
Zbigniew Jędrzejewski-Szmek
36c35e765d test-parse-util: add tests with explicit plus character
I expected this to work, but our tests did not cover this
explicitly.

(cherry picked from commit 8eb491f499)
(cherry picked from commit 7c0ac515c8)
2023-02-13 14:50:14 +00:00
Zbigniew Jędrzejewski-Szmek
b4df64597b core/service: constify ExecCommand* in two functions
(cherry picked from commit 502096b565)
(cherry picked from commit e811aead84)
2023-02-13 14:50:14 +00:00
Luca Boccassi
158760941f core: imply DeviceAllow=/dev/tpmrm0 with LoadCredentialEncrypted
If the device access policy is restricted, add implicitly access to the TPM
if at least one encrypted credential needs to be loaded.

Fixes https://github.com/systemd/systemd/issues/26042

(cherry picked from commit 398dc7d39b)
(cherry picked from commit f0126ad7f9)
2023-02-13 14:50:14 +00:00
Yu Watanabe
a87c01d202 udevd: configure a child process name for worker processes
This effectively reverts commit ff86c92e30,
and re-apply 49f3ee7e74.

The change was dropped due to the process name was not correctly logged,
but the issue was fixed by dd15e4cb57.
Let's set the child process name again.

(cherry picked from commit e955a7f460)
(cherry picked from commit 62055cfd4b)
2023-02-13 14:50:14 +00:00
Lennart Poettering
2c984010bc journal: print a useful error message if we hit the journal file open limit
See: #20921
(cherry picked from commit 763c46defa)
(cherry picked from commit 1187340c9d)
2023-02-13 14:50:14 +00:00
Zbigniew Jędrzejewski-Szmek
b851a357ec resolve: adjust message for NXDOMAIN lookup result
Previously, we reported:
  nx.example.org: resolve call failed: 'nx.example.org' not found
But the call did succeed, and in fact all communication with the upstream
servers was successful, and we got an authoritative negative answer.
So instead of saying that the call fail, just say that the host doesn't exist:
  nx.example.org: Name 'nx.example.org' not found

I wanted to keep the prefix of "<name>: ", to keep the output uniform. But
it'd look a bit strange to say "<name>: <name> not found", so I added "Name "
to make the output more readable. (Another option would be to not display
the error string received from resolved, but that seems risky: even if right
now resolved uses just one message format, it could start doing something else
in the future, so it's better to display the error as received.)

Fixes #26233.

(cherry picked from commit bbb86efa7c)
(cherry picked from commit 7c9dcd50f0)
2023-02-13 14:50:14 +00:00
Zbigniew Jędrzejewski-Szmek
55cc0a5d17 resolve: define normal macros for BUS_ERROR_DNS error codes
This result is identical after cpp is done, so we don't save anything
by not having the usual macros. And with the usual macros it's easier to
grep and code-crossreferencing works better.

(cherry picked from commit 03e80572a7)
(cherry picked from commit c538abc8bd)
2023-02-13 14:50:14 +00:00
Yu Watanabe
7a862d9d1a argv-util: also update program_invocation_short_name
Our logging uses program_invocation_short_name. Without this patch,
logs from forked client may become broken; spuriously truncated or
the short invocation name is not completely shown in the log.

(cherry picked from commit dd15e4cb57)
(cherry picked from commit ce4726468d)
2023-02-13 14:50:14 +00:00
Zbigniew Jędrzejewski-Szmek
9a620ef11d repart: silence bogus gcc warning
[2/3] Compiling C object systemd-repart.p/src_partition_repart.c.o
../src/partition/repart.c: In function ‘context_open_copy_block_paths’:
../src/partition/repart.c:5194:41: warning: ‘devno’ may be used uninitialized [-Wmaybe-uninitialized]
 5194 |                         source_fd = r = device_open_from_devnum(S_IFBLK, devno, O_RDONLY|O_CLOEXEC|O_NONBLOCK, &opened);
      |                                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../src/partition/repart.c:5188:31: note: ‘devno’ was declared here
 5188 |                         dev_t devno;
      |                               ^~~~~

This is with gcc-13.0.1-0.2.fc38.x86_64, -O2. I'm pretty sure the code
is correct. I also tried adding some asserts where errno is used for the return
value, but that didn't help. I think resolve_copy_blocks_auto() is just too long
for gcc to understand.

(cherry picked from commit 03f5e501b6)
(cherry picked from commit 53ca414a45)
2023-02-13 14:50:14 +00:00
Zbigniew Jędrzejewski-Szmek
828e73a7bb repart: fix invalid errno in log
(cherry picked from commit 375ffdba43)
(cherry picked from commit 31b7785814)
2023-02-13 14:50:14 +00:00
Robin Humble
9a906fae89 pid1: fix segv triggered by status query (#26279)
If any query makes it to the end of install_info_follow() then I think symlink_target is set to NULL.
If that is followed by -EXDEV from unit_file_load_or_readlink(), then that causes basename(NULL)
which segfaults pid 1.

This is triggered by eg. "systemctl status crond" in RHEL9 if

/etc/systemd/system/crond.service
  -> /ram/etc/systemd/system/crond.service
  -> /usr/lib/systemd/system/.crond.service.blah.blah
  -> /usr/lib/systemd/system/crond.service

(cherry picked from commit 19cfda9fc3)
(cherry picked from commit 015b0ca928)
2023-02-13 14:50:14 +00:00
Jan Janssen
3ae3405989 meson: Install missing bash-completions
(cherry picked from commit 7b2f84e3f2)
(cherry picked from commit 6d8885af57)
2023-02-13 14:50:14 +00:00
Jan Janssen
8a91017dad meson: Install missing network file
(cherry picked from commit 17be6f2709)
(cherry picked from commit aa79d157af)
2023-02-13 14:50:14 +00:00
Jan Janssen
4aa6be359f meson: Install all catalogs
(cherry picked from commit 3774ff06f2)
(cherry picked from commit 5bad071f73)
2023-02-13 14:50:14 +00:00
Rudi Heitbaum
f048fba73f glibc: Conditionally #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
Co-authored-by: Frantisek Sumsal <frantisek@sumsal.cz>
(cherry picked from commit 1bb6ba08b1)
(cherry picked from commit a8b9c4766d)
2023-02-13 14:50:14 +00:00
Zbigniew Jędrzejewski-Szmek
c8b6bc7530 sysusers: insist that root group is 0
In https://bugzilla.redhat.com/show_bug.cgi?id=2156900 sysusers was reporting a
conflict between the following lines:
  u root 0:0 "Super User" /root /bin/bash
  u root    0     "Super User" /root

The problem is that those configurations are indeed not equivalent. If group 0
exists with a different name, the first line would just create the user, but the
second line would create a 'root' group with a different GID. The second
behaviour seems definitely wrong. (Or at least more confusing in practice than
the first one. The system is in a strange shape, but the second approach takes
an additional step than is worse than doing nothing.)

When this line was initially added, we didn't have the uid:gid functionality for
'u', so we didn't think about this too much. But now we do, so we should use it.

$ build/systemd-sysusers --root=/var/tmp/inst7 --inline 'g foobar 0'
Creating group 'foobar' with GID 0.

$ build/systemd-sysusers --root=/var/tmp/inst7 --inline 'u root 0 "Zuper zuper"'
src/sysusers/sysusers.c:1365: Creating group 'root' with GID 999.
src/sysusers/sysusers.c:1115: Suggested user ID 0 for root already used.
src/sysusers/sysusers.c:1183: Creating user 'root' (Zuper zuper) with UID 999 and GID 999.

vs.

$ build/systemd-sysusers --root=/var/tmp/inst7 --inline 'u root 0:0 "Zuper zuper"'
src/sysusers/sysusers.c:1183: Creating user 'root' (Zuper zuper) with UID 0 and GID 0.

(cherry picked from commit 49bb7fe5f8)
(cherry picked from commit 8ad3d68acd)
2023-02-13 14:50:14 +00:00
Arsen Arsenović
48f3e2d5c5 importd: Always specify file unpacked by tar
Despite popular belief, the default file extracted by GNU tar is not stdin.  It
is the value of the TAPE environment variable, falling back on a compile-time
constant.  On my system, the default value is /dev/full, which causes tar to
just spin forever due to --ignore-zeros.  Always specifying this flag is the
safe thing to do.

  ~$ tar --show-defaults
  --format=gnu -f/dev/full -b20 --quoting-style=escape
  --rmt-command=/usr/sbin/grmt

See also: ``(tar)defaults'', available via Info viewers, and in HTML form at:
https://www.gnu.org/s/tar/manual/html_node/defaults.html

(cherry picked from commit 181eea677d)
(cherry picked from commit 817b8441c4)
2023-02-13 14:50:14 +00:00
Yu Watanabe
41fdc8ed32 sd-dhcp-server: allow to send header only message
If we receive a header only message, and the server is running in relay
mode, then the assertion was triggered.

Fixes #26151.

(cherry picked from commit b52031dbbc)
(cherry picked from commit 7aeb2a8d4e)
2023-02-13 14:50:14 +00:00