Lennart Poettering [Sun, 16 Jul 2017 14:17:59 +0000 (16:17 +0200)]
Merge pull request #6380 from keszybz/seccomp-arm64
Seccomp arm64
Zbigniew Jędrzejewski-Szmek [Sat, 15 Jul 2017 19:30:48 +0000 (19:30 +0000)]
test-seccomp: arm64 does not have access() and poll()
glibc uses faccessat and ppoll, so just add a filters for that.
(cherry picked from commit
abc0213839fef92e2e2b98a434914f22ece48490)
Zbigniew Jędrzejewski-Szmek [Sat, 15 Jul 2017 19:30:01 +0000 (19:30 +0000)]
seccomp: arm64 does not have mmap2
I messed up when adding the definitions in
4278d1f5310f5acb4c6a6788233625234edb5145.
Unfortunately I didn't have the hardware at hand and went by
looking at the kernel headers.
(cherry picked from commit
53196fafcb7b24b45ed4f48ab894d00a24a6d871)
Zbigniew Jędrzejewski-Szmek [Sat, 15 Jul 2017 19:28:02 +0000 (19:28 +0000)]
seccomp: arm64/x32 do not have _sysctl
So don't even try to added the filter to reduce noise.
The test is updated to skip calling _sysctl because the kernel prints
an oops-like message that is confusing and unhelpful:
Jul 15 21:07:01 rpi3 kernel: test-seccomp[8448]: syscall -10080
Jul 15 21:07:01 rpi3 kernel: Code:
aa0503e4 aa0603e5 aa0703e6 d4000001 (
b13ffc1f)
Jul 15 21:07:01 rpi3 kernel: CPU: 3 PID: 8448 Comm: test-seccomp Tainted: G W 4.11.8-300.fc26.aarch64 #1
Jul 15 21:07:01 rpi3 kernel: Hardware name: raspberrypi rpi/rpi, BIOS 2017.05 06/24/2017
Jul 15 21:07:01 rpi3 kernel: task:
ffff80002bb0bb00 task.stack:
ffff800036354000
Jul 15 21:07:01 rpi3 kernel: PC is at 0xffff8669c7c4
Jul 15 21:07:01 rpi3 kernel: LR is at 0xaaaac64b6750
Jul 15 21:07:01 rpi3 kernel: pc : [<
0000ffff8669c7c4>] lr : [<
0000aaaac64b6750>] pstate:
60000000
Jul 15 21:07:01 rpi3 kernel: sp :
0000ffffdc640fd0
Jul 15 21:07:01 rpi3 kernel: x29:
0000ffffdc640fd0 x28:
0000000000000000
Jul 15 21:07:01 rpi3 kernel: x27:
0000000000000000 x26:
0000000000000000
Jul 15 21:07:01 rpi3 kernel: x25:
0000000000000000 x24:
0000000000000000
Jul 15 21:07:01 rpi3 kernel: x23:
0000000000000000 x22:
0000000000000000
Jul 15 21:07:01 rpi3 kernel: x21:
0000aaaac64b4940 x20:
0000000000000000
Jul 15 21:07:01 rpi3 kernel: x19:
0000aaaac64b88f8 x18:
0000000000000020
Jul 15 21:07:01 rpi3 kernel: x17:
0000ffff8669c7a0 x16:
0000aaaac64d2ee0
Jul 15 21:07:01 rpi3 kernel: x15:
0000000000000000 x14:
0000000000000000
Jul 15 21:07:01 rpi3 kernel: x13:
203a657275746365 x12:
0000000000000000
Jul 15 21:07:01 rpi3 kernel: x11:
0000ffffdc640418 x10:
0000000000000000
Jul 15 21:07:01 rpi3 kernel: x9 :
0000000000000005 x8 :
00000000ffffd8a0
Jul 15 21:07:01 rpi3 kernel: x7 :
7f7f7f7f7f7f7f7f x6 :
7f7f7f7f7f7f7f7f
Jul 15 21:07:01 rpi3 kernel: x5 :
65736d68716f7277 x4 :
0000000000000000
Jul 15 21:07:01 rpi3 kernel: x3 :
0000000000000008 x2 :
0000000000000000
Jul 15 21:07:01 rpi3 kernel: x1 :
0000000000000000 x0 :
0000000000000000
Jul 15 21:07:01 rpi3 kernel:
(cherry picked from commit
1e20e640132c700c23494bb9e2619afb83878380)
Zbigniew Jędrzejewski-Szmek [Sat, 15 Jul 2017 19:25:19 +0000 (19:25 +0000)]
shared/seccomp-util: add parentheses and no. after syscall name
"Failed to add rule for system call access, ignoring: Numerical argument out of domain"
is confusing. Make that "... system call access() / 238".
(cherry picked from commit
977dc6ca5acb8069a2966ec63e7378576bc2ca51)
Lucas Werkmeister [Sat, 15 Jul 2017 16:29:09 +0000 (18:29 +0200)]
Fix spelling (#6378)
Susant Sahani [Sat, 15 Jul 2017 11:57:52 +0000 (11:57 +0000)]
journald: make reading /dev/kmsg optional (#6362)
Closes #6022
IPv4v6 [Sat, 15 Jul 2017 11:53:21 +0000 (13:53 +0200)]
add version argument to help function (#6377)
Signed-off-by: Stefan Pietsch <mail.ipv4v6+gh@gmail.com>
Tejun Heo [Fri, 14 Jul 2017 17:27:13 +0000 (13:27 -0400)]
core: support "nsdelegate" cgroup v2 mount option (#6294)
cgroup namespace wasn't useful for delegation because it allowed resource
control interface files (e.g. memory.high) to be written from inside the
namespace - this allowed the namespace parent's resource distribution to be
disturbed by its namespace-scoped children.
A new mount option, "nsdelegate", was added to cgroup v2 to address this issue.
The flag is meangingful only when mounting cgroup v2 in the init namespace and
makes a cgroup namespace a delegation boundary. The kernel feature is pending
for v4.13.
This should have been the default behavior on cgroup namespaces and this commit
makes systemd try "nsdelegate" first when trying to mount cgroup v2 and fall
back if the option is not supported.
Note that this has danger of breaking usages which depend on modifying the
parent's resource settings from the namespace root, which isn't a valid thing
to do, but such usages may still exist.
Vito Caputo [Fri, 14 Jul 2017 17:26:01 +0000 (10:26 -0700)]
journal: elide fd matching from window_matches() (#6340)
Introduces window_matches_fd() for the fd matching case in try_context(),
In find_mmap() we're already walking a list of windows by fd, checking
this is pointless work in a potentially hot loop with many windows.
Vito Caputo [Fri, 14 Jul 2017 17:24:46 +0000 (10:24 -0700)]
journal: use context_attach_window() in add_mmap() (#6339)
Instead of context_detach_window() and a manual attach of the new
window, simply call context_attach_window() which performs the
detach first if appropriate.
Hans de Goede [Fri, 14 Jul 2017 16:29:59 +0000 (18:29 +0200)]
hwdb: Add ACCEL_MOUNT_MATRIX for a number of Intel Bay Trail based devices (#6357)
This commit adds ACCEL_MOUNT_MATRIX entries for the following devices:
-Acer Iconia Tab8 W1-810
-Asustek T100CHI Transformer 2-in-1
-Asustek T100TA Transformer 2-in-1
-Chuwi Vi8 Plus tablet
-Cube iWork8 Air (i1-TF) tablet
-GP-electronic T701 7" tablet
-HP Stream 7 tablet
-I.T.Works TW891 2-in-1
-Jumper Ezpad mini 3
-Lamina I8270 7" tablet
-Peaq MMC1010 2-in-1
-Pipo W2S 8" tablet
-Ployer Momo7w tablet
-Point of View TAB-P800W 8" tablet
-Trekstor Surftab Wintron 7.0 ST70416-6 7" tablet
Christian Hesse [Fri, 14 Jul 2017 16:28:28 +0000 (18:28 +0200)]
build-sys: install udev rule 70-joystick.{rules,hwdb} (#6363)
* meson: install udev files 70-joystick.{rules,hwdb}
* Makefile: install udev file 70-joystick.hwdb
Jeremy Bicha [Thu, 13 Jul 2017 14:44:33 +0000 (10:44 -0400)]
escape: Fix help description (#6352)
Resolves: #6351
florianjacob [Wed, 12 Jul 2017 14:01:10 +0000 (16:01 +0200)]
resolved: consider pointopoint links for local multicast (#6343)
Resolves #6313.
Lennart Poettering [Wed, 12 Jul 2017 14:00:44 +0000 (16:00 +0200)]
Revert "core: link user keyring to session keyring (#6275)" (#6342)
This reverts commit
437a85112e02042b62751395b9e7225628c1b708.
The outcome of this isn't that clear, let's revert this for now, see
discussion on #6286.
Lennart Poettering [Wed, 12 Jul 2017 07:28:20 +0000 (09:28 +0200)]
Merge pull request #6300 from keszybz/refuse-to-load-some-units
Refuse to load some units
Zbigniew Jędrzejewski-Szmek [Wed, 12 Jul 2017 07:25:59 +0000 (03:25 -0400)]
NEWS: say that libidn2 is experimental (#6335)
Handling of "_" and some other details requires more thought:
https://gitlab.com/libidn/libidn2/issues/30
Let's switch the default back to libidn and add a note in NEWS.
Lennart Poettering [Wed, 12 Jul 2017 07:25:09 +0000 (09:25 +0200)]
Merge pull request #6337 from poettering/more-new-v234
Let's try to release v234 tomorrow
Zbigniew Jędrzejewski-Szmek [Tue, 11 Jul 2017 17:36:15 +0000 (13:36 -0400)]
man: add warnings that Private*= settings are not always applied
Zbigniew Jędrzejewski-Szmek [Thu, 6 Jul 2017 17:54:42 +0000 (13:54 -0400)]
core/load-fragment: refuse units with errors in RootDirectory/RootImage/DynamicUser
Behaviour of the service is completely different with the option off, so the
service would probably mess up state on disk and do unexpected things.
Zbigniew Jędrzejewski-Szmek [Thu, 6 Jul 2017 17:28:19 +0000 (13:28 -0400)]
core/load-fragment: refuse units with errors in certain directives
If an error is encountered in any of the Exec* lines, WorkingDirectory,
SELinuxContext, ApparmorProfile, SmackProcessLabel, Service (in .socket
units), User, or Group, refuse to load the unit. If the config stanza
has support, ignore the failure if '-' is present.
For those configuration directives, even if we started the unit, it's
pretty likely that it'll do something unexpected (like write files
in a wrong place, or with a wrong context, or run with wrong permissions,
etc). It seems better to refuse to start the unit and have the admin
clean up the configuration without giving the service a chance to mess
up stuff.
Note that all "security" options that restrict what the unit can do
(Capabilities, AmbientCapabilities, Restrict*, SystemCallFilter, Limit*,
PrivateDevices, Protect*, etc) are _not_ treated like this. Such options are
only supplementary, and are not always available depending on the architecture
and compilation options, so unit authors have to make sure that the service
runs correctly without them anyway.
Fixes #6237, #6277.
Lennart Poettering [Tue, 11 Jul 2017 17:26:10 +0000 (19:26 +0200)]
hwdb: update hwdb again for v234
Lennart Poettering [Tue, 11 Jul 2017 17:17:58 +0000 (19:17 +0200)]
update NEWS file, let's try to release this tomorrow
Yu Watanabe [Tue, 11 Jul 2017 17:12:48 +0000 (02:12 +0900)]
time-util: make parse_timestamp() return -EINVAL if the input is very old date (#6327)
This reverts
7635ab8e74ea4a94e81143c3077570a986df375c and makes parse_timestamp()
return -EINVAL if the input is older than 1970-01-01.
Fixes #6290.
Colin Walters [Tue, 11 Jul 2017 16:48:57 +0000 (12:48 -0400)]
fstab-generator: Chase symlinks where possible (#6293)
This has a long history; see see
5261ba901845c084de5a8fd06500ed09bfb0bd80
which originally introduced the behavior. Unfortunately that commit
doesn't include any rationale, but IIRC the basic issue is that
systemd wants to model the real mount state as units, and symlinks
make canonicalization much more difficult.
At the same time, on a RHEL6 system (upstart), one can make e.g. `/home` a
symlink, and things work as well as they always did; but one doesn't have
access to the sophistication of mount units (dependencies, introspection, etc.)
Supporting symlinks here will hence make it easier for people to do upgrades to
RHEL7 and beyond.
The `/home` as symlink case also appears prominently for OSTree; see
https://ostree.readthedocs.io/en/latest/manual/adapting-existing/
Further work has landed in the nspawn case for this; see e.g.
d944dc9553009822deaddec76814f5642a6a8176
A basic limitation with doing this in the fstab generator (and that I hit while
doing some testing) is that we obviously can't chase symlinks into mounts,
since the generator runs early before mounts. Or at least - doing so would
require multiple passes over the fstab data (as well as looking at existing
mount units), and potentially doing multi-phase generation. I'm not sure it's
worth doing that without a real world use case. For now, this will fix at least
the OSTree + `/home` <https://bugzilla.redhat.com/show_bug.cgi?id=1382873> case
mentioned above, and in general anyone who for whatever reason has symlinks in
their `/etc/fstab`.
Yu Watanabe [Tue, 11 Jul 2017 15:30:29 +0000 (00:30 +0900)]
bootctl: allow non-root user to run `bootctl status` (#5964)
Zbigniew Jędrzejewski-Szmek [Tue, 11 Jul 2017 15:25:26 +0000 (11:25 -0400)]
Merge pull request #6329 from poettering/random-mini-fixes
random-util.c mini fixes
Zbigniew Jędrzejewski-Szmek [Tue, 11 Jul 2017 08:45:03 +0000 (04:45 -0400)]
systemd: do not stop units bound to inactive units while coldplugging (#6316)
When running systemd-analyze verify I would get a random subset of warnings
(sometimes none, sometimes one or two):
dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.swap: Unit is bound to inactive unit dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device. Stopping, too.
home.mount: Unit is bound to inactive unit dev-disk-by\x2duuid-
75751556\x2d6e31\x2d438b\x2d99c9\x2dd626330d9a1b.device. Stopping, too.
boot.mount: Unit is bound to inactive unit dev-disk-by\x2duuid-
56c56bfd\x2d93f0\x2d48fb\x2dbc4b\x2d90aa67144ea5.device. Stopping, too.
When running with debug on, it's pretty obvious what is happening:
home.mount: Changed dead -> mounted
home.mount: Unit is bound to inactive unit dev-disk-by\x2duuid-
75751556\x2d6e31\x2d438b\x2d99c9\x2dd626330d9a1b.device. Stopping, too.
home.mount: Trying to enqueue job home.mount/stop/fail
home.mount: Installed new job home.mount/stop as 27
home.mount: Enqueued job home.mount/stop as 27
...
dev-disk-by\x2duuid-
75751556\x2d6e31\x2d438b\x2d99c9\x2dd626330d9a1b.device: Installed new job dev-disk-by\x2duuid-
75751556\x2d6e31\x2d438b\x2d99c9\x2dd626330d9a1b.device/start as 47
dev-disk-by\x2duuid-
75751556\x2d6e31\x2d438b\x2d99c9\x2dd626330d9a1b.device: Changed dead -> plugged
dev-disk-by\x2duuid-
75751556\x2d6e31\x2d438b\x2d99c9\x2dd626330d9a1b.device: Job dev-disk-by\x2duuid-
75751556\x2d6e31\x2d438b\x2d99c9\x2dd626330d9a1b.device/start finished, result=done
Fixes #2206, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=808151.
Zbigniew Jędrzejewski-Szmek [Tue, 11 Jul 2017 08:42:21 +0000 (04:42 -0400)]
resolved: allow resolution of names which libidn2 considers invalid (#6315)
https://tools.ietf.org/html/rfc5891#section-4.2.3.1 says that
> The Unicode string MUST NOT contain "--" (two consecutive hyphens) in the third
> and fourth character positions and MUST NOT start or end with a "-" (hyphen).
This means that libidn2 refuses to encode such names.
Let's just resolve them without trying to use IDN.
Zbigniew Jędrzejewski-Szmek [Tue, 11 Jul 2017 08:40:11 +0000 (04:40 -0400)]
Add comments to log_functions which shouldn't be called from library code (#6326)
Lennart Poettering [Tue, 11 Jul 2017 08:36:53 +0000 (10:36 +0200)]
random-util: we are fine if ints are 16 bytes actually
Not that it matters IRL, but let's make this less surprising to read...
Lennart Poettering [Tue, 11 Jul 2017 08:35:47 +0000 (10:35 +0200)]
random-util: always cast from smaller to bigger type when comparing
When we compare two size values, let's make sure we cast from the
smaller to the bigger type first, if both types differ, rather than the
reverse in order to not run into overflows.
Lennart Poettering [Tue, 11 Jul 2017 08:00:21 +0000 (10:00 +0200)]
Merge pull request #6325 from keszybz/make-delta-boring-again
Make delta output repeatable
Zbigniew Jędrzejewski-Szmek [Mon, 10 Jul 2017 23:25:27 +0000 (19:25 -0400)]
Merge pull request #6322 from poettering/mount-mini-fixes
a bunch of mini fixes for mount-tool.c
Vito Caputo [Mon, 10 Jul 2017 23:24:56 +0000 (16:24 -0700)]
journal: explicitly add fds to mmap-cache (#6307)
This way we have a MMapFileDescriptor reference external to the cache,
and can supply the handle directly to mmap_cache_get(), eliminating
hashmap lookups entirely from the hot path.
Alex Lu [Mon, 10 Jul 2017 20:34:40 +0000 (04:34 +0800)]
hwdb: add axis range corrections for Lenovo X1 Carbon 5th gen (over (#6320)
rmi4).
Lennart Poettering [Mon, 10 Jul 2017 19:42:39 +0000 (21:42 +0200)]
mount: add missing validation error message
We really should generate exactly one log message for each error, hence
let's do that in this one case too.
Zbigniew Jędrzejewski-Szmek [Mon, 10 Jul 2017 19:40:01 +0000 (15:40 -0400)]
delta: sort files and dirs before processing
This should make output deterministic, and independent of the directory
layout on disk. Just using ordered hashmaps would be enough to make
the output deterministic on a specific machine, but to make it
identical on different machines with the same set of files and
directories, names are sorted after being use.
Fixes #6157.
Lennart Poettering [Mon, 10 Jul 2017 19:41:14 +0000 (21:41 +0200)]
mount: change find_loop_device() error code when no loop device is found to ENXIO
ENOENT is a bit too likely to be returned for various reasons, for
example if /sys or /proc are not mounted and hence the files we need not
around. Hence, let's use ENXIO instead, which is equally fitting for the
purpose but has the benefit that the underlying calls won't generate
this error on their own, hence any ambiguity is removed.
Lennart Poettering [Mon, 10 Jul 2017 19:41:02 +0000 (21:41 +0200)]
mount: add debug logging for the case when we knowingly ignore an error
Zbigniew Jędrzejewski-Szmek [Mon, 10 Jul 2017 18:55:14 +0000 (14:55 -0400)]
basic/strv: use existing qsort_safe() helper
strv_sort() predates qsort_safe(), but we can convert it to it to
save a few lines.
Lennart Poettering [Mon, 10 Jul 2017 19:39:23 +0000 (21:39 +0200)]
mount: rework find_loop_device() to log about no errors
We should either log about all errors in a function, or about none (and
then leave the logging about it to the caller who we propagate the error
to). Given that the callers of find_loop_device() already log about the
returned errors let's hence suppress the log messages in
find_loop_device() itself.
Lennart Poettering [Mon, 10 Jul 2017 19:36:59 +0000 (21:36 +0200)]
mount: fix potential bad memory access when /proc/self/mountinfo is empty
It's unlikely this can ever be triggered, but let's be safe rather than
sorry, and handle the case where the list of mount points is zero, and
the "l" array thus NULL. let's ensure we allocate at least one entry.
Lennart Poettering [Mon, 10 Jul 2017 17:44:06 +0000 (19:44 +0200)]
man: briefly document permitted user/group name syntax for User=/Group= and syusers.d (#6321)
As discussed here:
https://lists.freedesktop.org/archives/systemd-devel/2017-July/039237.html
Lennart Poettering [Mon, 10 Jul 2017 16:25:58 +0000 (18:25 +0200)]
update TODO
Boucman [Sun, 9 Jul 2017 23:52:25 +0000 (01:52 +0200)]
expand path of systemctl link argument (#6186)
systemctl link is the only systemctl verb that takes a filename (and not
a unit name) as argument
use path_strv_make_absolute_cwd to expand the provided filename in order
to make it easier to use from the command line
keep the absolute pathname requirement when --root is used
[zj: add explicit error messages for the cases of --root and plain filename
instead of skipping normalization and just relying on systemd to refuse
to link non-absolute arguments. This allows us to make the error message
more informative.]
Djalal Harouni [Sun, 9 Jul 2017 22:23:57 +0000 (00:23 +0200)]
Merge pull request #6287 from keszybz/wsign-compare
build-sys: use -Wextra if available
Djalal Harouni [Sun, 9 Jul 2017 22:19:44 +0000 (00:19 +0200)]
Merge pull request #6289 from keszybz/config-tweaks
Config parsing tweaks
Alex Lu [Sun, 9 Jul 2017 22:08:25 +0000 (06:08 +0800)]
hwdb: add axis range corrections for Lenovo X1 Carbon 5th gen. (#6312)
Djalal Harouni [Sun, 9 Jul 2017 15:58:52 +0000 (17:58 +0200)]
Merge pull request #6311 from keszybz/memleak
Fix trivial memleak in sd-login code
Nikolai Kondrashov [Wed, 24 May 2017 11:58:01 +0000 (14:58 +0300)]
units: Tell login to preserve environment (#6023)
Make agetty started by *getty* units pass '-p' option to "login", so it
doesn't clear the environment and passes whatever was setup by systemd
to shells. This is needed especially for programs which are specified as
user shells, but won't read locale settings from anywhere but
environment.
[zj: cherry-pick just the second patch from the series, see discussion
on the pull request.]
Yu, Li-Yu [Sat, 8 Jul 2017 22:59:29 +0000 (17:59 -0500)]
sd_uid_get_state: do not return -ENOENT if state is "offline" (#6302)
Zbigniew Jędrzejewski-Szmek [Sat, 8 Jul 2017 22:04:44 +0000 (18:04 -0400)]
sd-login: fix memleak when output argument is NULL
Zbigniew Jędrzejewski-Szmek [Wed, 5 Jul 2017 00:04:29 +0000 (20:04 -0400)]
networkd: trivial style cleanup
Yu Watanabe [Sat, 8 Jul 2017 19:59:07 +0000 (04:59 +0900)]
time-util: make parse_timestamp() set 0 if the input is very old date (#6297)
If the input is older than "1970-01-01 UTC", then `parse_timestamp()`
fails and returns -EINVAL. However, if the input is e.g. `-100years`,
then the function succeeds and sets `usec = 0`.
This commit makes the function also succeed for old dates and set
`usec = 0`.
Fixes #6290.
Vito Caputo [Fri, 7 Jul 2017 18:32:21 +0000 (11:32 -0700)]
shared: leave output_journal() output in buffer (#6304)
e268b81e moved an fflush() from output_json() to the generic
output_journal(), when it probably should have deleted all fflush()
calls from logs-show.c altogether.
The caller supplies the FILE * to these functions, and should be in
charge of flushing as needed. The current implementation essentially
defeats any buffering stdio was bringing to the table, resulting in
extraneous tiny write() calls in commands like `journalctl -b`.
This commit removes the fflush() call from output_journal(), and adds
them to journalctl before waiting for more entries and at completion.
This way in the hot path when journalctl loops on entries stdio can
combine multiple entries into bulkier write() calls.
tblume [Thu, 6 Jul 2017 18:30:14 +0000 (20:30 +0200)]
tests: adapt test-functions to run tests on SUSE (#6270)
Benjamin Robin [Thu, 6 Jul 2017 02:56:17 +0000 (04:56 +0200)]
resolve: Try to remove the ambiguity about the mtu parameter of dns_packet_new (#6285)
Actually the caller of dns_packet_new() pass 0 or the data size of the UDP message.
So try to reflect that, so rename the `mtu` parameter to `min_alloc_dsize`.
In fact `mtu` is the size of the whole UDP message, including the UDP header,
and here we just need to pass the size of data (without header). This was confusing.
Also add a check on the requested allocated size, since some caller do not check what is really allocated.
Indeed the function do not allocate more than DNS_PACKET_SIZE_MAX whatever the value of the `mtu` parameter.
NeilBrown [Thu, 6 Jul 2017 02:53:41 +0000 (12:53 +1000)]
fstab-generator: fix new NULL dereference. (#6296)
fstype can be NULL, particularly when called from add_sysroot_mount(),
so we need to use STRPTR_IN_SET().
Zbigniew Jędrzejewski-Szmek [Wed, 5 Jul 2017 14:27:58 +0000 (10:27 -0400)]
Merge pull request #6236 from yuwata/mount-loop
systemd-mount: support discovery of loop backing file
Yu Watanabe [Thu, 29 Jun 2017 05:53:49 +0000 (14:53 +0900)]
systemd-mount: support relative paths
Yu Watanabe [Wed, 5 Jul 2017 12:55:39 +0000 (21:55 +0900)]
systemd-mount: support unmounting devices on remote host
The commit
9017f5d88d5061487de53f00a1a8c0a83e41e760 prohibits
to unmount devices on remote host. This makes reenable such feature.
Yu Watanabe [Wed, 5 Jul 2017 12:54:40 +0000 (21:54 +0900)]
systemd-mount: support discovery of loop backing file
```
$ suro systemd-mount /path/to/disk.img
Started unit run-media-system-disk.img.mount for mount point: /run/media/system/disk.img
```
Closes #6226.
Zbigniew Jędrzejewski-Szmek [Wed, 5 Jul 2017 03:54:00 +0000 (23:54 -0400)]
basic/log: use getenv instead of secure_getenv
secure_getenv does not work when the process has a nonempty permitted
capability set, which means that it's unduly hard to configure logging in
systemd-logind, systemd-resolved, and others.
secure_getenv is useful for code in libraries which might get called from a
setuid application. log_parse_environment() is never called from our library
code, but directly form various top-level executables. None of them are
installed suid, and none are prepared to be used this way, since many
additional changes would be required to make that safe. We may just as well
drop the check and allow SYSTEMD_LOG_* to properly parsed.
Fixes #4900.
Zbigniew Jędrzejewski-Szmek [Wed, 5 Jul 2017 03:51:35 +0000 (23:51 -0400)]
resolved: treat failure to parse config as non-fatal
Fixes #6014.
Mike Gilbert [Wed, 5 Jul 2017 03:22:47 +0000 (23:22 -0400)]
test-fs-util: re-order test_readlink_and_make_absolute and test_get_files_in_directory (#6288)
test_readlink_and_make_absolute switches to a temp directory, and then
removes it.
test_get_files_in_directory calls opendir(".") from a directory that has
been removed from the filesystem.
This call sequence triggers a bug in Gentoo's sandbox library. This
library attempts to resolve the "." to an absolute path, and aborts when
it ultimately fails to do so.
Re-ordering the calls works around the issue until the sandbox library
can be fixed to more gracefully deal with this.
Bug: https://bugs.gentoo.org/590084
Zbigniew Jędrzejewski-Szmek [Tue, 4 Jul 2017 21:59:15 +0000 (17:59 -0400)]
meson: use -Wextra if available
-Wextra was not added to CFLAGS under meson by default, as it is
done by the autotools build.
C.f.
218f46711115669c26389a5bad79e57aa3c37f66.
Giedrius Statkevičius [Tue, 4 Jul 2017 21:51:02 +0000 (00:51 +0300)]
systemctl: print next timer trigger time with the status verb (#6242)
It is useful to know when a timer will trigger next when looking at a
timer status message so calculate and print that information.
Closes #5738.
Example output:
$ systemctl status dnf-makecache.timer
● dnf-makecache.timer - dnf makecache timer
Loaded: loaded (/usr/lib/systemd/system/dnf-makecache.timer; enabled; vendor preset: enabled)
Active: active (waiting) since Tue 2017-07-04 17:24:02 EDT; 24min ago
Trigger: Tue 2017-07-04 18:15:56 EDT; 27min left
Benjamin Robin [Tue, 4 Jul 2017 21:42:20 +0000 (23:42 +0200)]
basic: Fix build warning in random-util (#6284)
Franck Bui [Tue, 4 Jul 2017 15:41:09 +0000 (17:41 +0200)]
gpt-auto-generator: fix the handling of the value returned by fstab_has_fstype() in add_swap() (#6280)
fstab_has_fstype() returns '1' if fstab contains the passed fstype, not '0'.
NeilBrown [Tue, 4 Jul 2017 07:47:40 +0000 (17:47 +1000)]
fstab-generator: handle NFS "bg" mounts correctly. (#6103)
When "bg" is specified for NFS mounts, and if the server is
not accessible, two behaviors are possible depending on networking
details.
If a definitive error is received, such a EHOSTUNREACH or ECONNREFUSED,
mount.nfs will fork and continue in the background, while /bin/mount
will report success.
If no definitive error is reported but the connection times out
instead, then the mount.nfs timeout will normally be longer than the
systemd.mount timeout, so mount.nfs will be killed by systemd.
In the first case the mount has appeared to succeed even though
it hasn't. This can be confusing. Also the background mount.nfs
will never get cleaned up, even if the mount unit is stopped.
In the second case, mount.nfs is killed early and so the mount will
not complete when the server comes back.
Neither of these are ideal.
This patch modifies the options when an NFS bg mount is detected to
force an "fg" mount, but retain the default "retry" time of 10000
minutes that applies to "bg" mounts.
It also imposes "nofail" behaviour and sets the TimeoutSec for the
mount to "infinity" so the retry= time is allowed to complete.
This provides near-identical behaviour to an NFS bg mount started directly
by "mount -a". The only difference is that systemd will not wait for
the first mount attempt, while "mount -a" will.
Fixes #6046
Lennart Poettering [Tue, 4 Jul 2017 07:43:07 +0000 (09:43 +0200)]
Merge pull request #6274 from keszybz/etags-ctags
meson: ctags support
Peter Hutterer [Tue, 4 Jul 2017 07:41:46 +0000 (17:41 +1000)]
udev: move the KEY_* defines to missing.h (#6278)
Дамјан Георгиевски [Tue, 4 Jul 2017 07:40:59 +0000 (09:40 +0200)]
fix add_esp() in the gpt-auto-generator.c (#6251)
b9088048b15cd21242b2308498fa865f864bfe45 seems to have broke it
fstab_is_mount_point() returns `true` (1) if the mount point exists and `false` (0) if it doesn't exist.
the change in
b9088048 considered that if fstab_is_mount_point() returns 0
the mount point exists.
Lennart Poettering [Tue, 4 Jul 2017 07:39:56 +0000 (09:39 +0200)]
Merge pull request #6255 from keszybz/property-escaping
Proper property escaping
Christian Hesse [Tue, 4 Jul 2017 07:38:31 +0000 (09:38 +0200)]
core: link user keyring to session keyring (#6275)
Commit
74dd6b515fa968c5710b396a7664cac335e25ca8 (core: run each system
service with a fresh session keyring) broke adding keys to user keyring.
Added keys could not be accessed with error message:
keyctl_read_alloc: Permission denied
So link the user keyring to our session keyring.
Zbigniew Jędrzejewski-Szmek [Tue, 4 Jul 2017 01:29:14 +0000 (21:29 -0400)]
Merge pull request #6258 from vcaputo/overflow
fix strxcpyx null termination overflows
Zbigniew Jędrzejewski-Szmek [Sun, 2 Jul 2017 16:37:42 +0000 (12:37 -0400)]
test-strxcpyx: add test for strpcpyf overflow
This fails before 'strxcpyx: don't overflow dest on strpcpyf truncate'.
Thomas H. P. Andersen [Mon, 3 Jul 2017 21:35:05 +0000 (23:35 +0200)]
NEWS: typo fixes (#6276)
Lennart Poettering [Mon, 3 Jul 2017 18:13:18 +0000 (20:13 +0200)]
build-sys: fix automake build
Lennart broke the automake build in
d4cbada2a95667c4d5d4310298bfcb446b1357b5. Let's fix that again, to
unfuck the CIs.
Zbigniew Jędrzejewski-Szmek [Mon, 3 Jul 2017 16:52:25 +0000 (12:52 -0400)]
Merge pull request #6271 from poettering/resolved-switching
downgrade DNS server switching log messages + NEWS fixes
Zbigniew Jędrzejewski-Szmek [Mon, 3 Jul 2017 16:42:29 +0000 (12:42 -0400)]
meson: add support for ctags
This is a squash of casync commits
https://github.com/systemd/casync/commit/
02fbbdb2b9a926a695a3ede7f3e3c17b9779db1a
(by Silvio Fricke)
and https://github.com/systemd/casync/commit/
b687a94b1e24df73d32f8cdcee29f3c00eae69c9.
Instead of checking during every meson config whether etags are
available, just try to call them and error out if not. This has
the advantage that the target is always available (if git is installed),
and the error message gives a hint what needs to be installed.
The naming is confusing, but etags(1) is pretty clear:
- emacs expects TAGS file in etags format
- vi expects tags file in ctags format
and automake docs are pretty clear too:
- tags target generates TAGS file
- ctags target generates tags file
Michal Soltys [Mon, 3 Jul 2017 16:38:13 +0000 (18:38 +0200)]
vconsole: search for usable source console (#6180)
When vconsole-setup is called without arguments, search for a usable
console instead of using /dev/tty0.
/dev/tty0 — pointing to the current active console — it not necessarily
usable and in such case vconsole-setup would exit with failure. In particular
when systemd-vconsole-setup.service was restarted from within an X
session, it always failed.
If the function searching for a usable source terminal fails, the first
encountered error is returned to the caller.
Closes #5367.
Additional changes:
- true/false functions with 'is_ prefix are renamed to functions with
'verify_vc_' prefix and return 0 on success and negative error on
failure
- O_NOCTTY flag is used when opening terminals
Matthew Garrett [Fri, 30 Jun 2017 18:27:47 +0000 (11:27 -0700)]
sd-boot: stub: Obtain PE section offsets from RAM, not disk (#6250)
In a Secure Boot scenario the stub loader will have been validated
before execution. A malicious drive could then change the data returned
in future reads, resulting in the loader obtaining incorrect section
offsets and (for instance) allowing the command line to be modified.
Pull that information out of the in-RAM representation of the loader
instead in order to avoid this.
Fixes: #6230
(Lennart did some minor coding style fixes, and renamed pefile.c → pe.c,
as suggested by Kay, given that the file now contains a function whose
name doesn't match the filename as prefix anymore.)
Zbigniew Jędrzejewski-Szmek [Mon, 3 Jul 2017 15:05:20 +0000 (11:05 -0400)]
units: use Requires in systemd-networkd-wait-online.service (#6065)
In the initial design, foobar-wait-online.service would have
Requisite=foobar.service, so that foobar-wait-online.service could be enabled
unconditionally, irrespective of whether foobar.service itself is enabled.
Unfortunately this doesn't work too well:
1. the message about foobar-wait-online.service being skipped because of a
"missing dependency" *looks* like an is problem. This is mostly cosmetic,
but it also quite confusing. We generally don't want any messages of this
type during default boot.
2. it is impossible to start and wait for the network in an
implementation-agnostic way: systemctl start network-online.target, or
Wants/After=network-online.target in a unit don't work because pulling in
network-online.target pulls in foobar-wait-online.service, but it in turn
does not pull in foobar.service. During startup, foobar.service is pulled in
by multi-user.target, but not in a smaller transaction which does not
include multi-user.target.
This change means that *-wait-online.service should be installed through
presets, so that it can be enabled/disabled at will by the administrator.
Our own systemd-networkd-wait-online.service does this already, and
similar change has been requested for NetworkManager-wait-online.service
(https://bugzilla.redhat.com/show_bug.cgi?id=1455704).
This change should by mostly backwards-compatible, unless somebody has some
wait-online.service enabled, without having the corresponding network
implementation enabled, and they are relying on it not being started. I think
that's relatively unlikely because of issue 1. above, and I'm not aware of this
being the default in any distro. And being able to start the network in an
implementation-agnostic way is pretty important, see
https://bugzilla.redhat.com/show_bug.cgi?id=1452866.
Zbigniew Jędrzejewski-Szmek [Mon, 3 Jul 2017 14:33:42 +0000 (10:33 -0400)]
man: remove unnecessary "the"
Lennart Poettering [Mon, 3 Jul 2017 14:11:16 +0000 (16:11 +0200)]
Merge pull request #6231 from keszybz/man-nss-resolved
man: describe the relationship between nss-myhostname and nss-resolved
Vito Caputo [Sun, 2 Jul 2017 09:09:06 +0000 (02:09 -0700)]
strxcpyx: assert throughout on non-NULL src/dest
Vito Caputo [Sun, 2 Jul 2017 09:01:59 +0000 (02:01 -0700)]
strxcpyx: don't overflow dest on strpcpyf truncate
When vsnprintf() truncated output, dest was advanced by the entire
size of dest leaving it just past the end. Then the fall-through \0
termination scribbled one past the end. The explicit null termination
is not necessary since vsnprintf() always includes the terminator even
when truncated.
Additionally these functions encourage calling with zero-length sizes,
while assuming non-zero sizes with potential buffer overflows.
Simply short-circuit the relevant functions when size == 0.
Fixes https://github.com/systemd/systemd/issues/6252
Zbigniew Jędrzejewski-Szmek [Sat, 1 Jul 2017 20:49:15 +0000 (16:49 -0400)]
bus-util: replace non-printable values with [unprintable]
Like I said in the previous commit, such values do not seem to appear in normal
use, but it's pretty hard to prove that all paths to assign values properly
check that they contain no spaces. So just in case some slip through, replace
values with spaces (in case of single-valued properties) or spaces and newlines
(in case of array proprties) with "[unprintable]". We were already doing it
in case of properties which we didn't know how to print, so this fits in well.
The advantage is the previous code which used escaping that a) this is easier
to spot, b) does not mess up printing of properties which were properly escaped
already.
v2:
- add comments
Franck Bui [Mon, 3 Jul 2017 12:48:21 +0000 (14:48 +0200)]
automount: don't lstat(2) upon umount request (#6086)
When umounting an NFS filesystem, it is not safe to lstat(2) the mountpoint at
all as that can block indefinitely if the NFS server is down.
umount() will not block, but lstat() will.
This patch therefore removes the call to lstat(2) and defers the handling of
any error to the child process which will issue the umount call.
Zbigniew Jędrzejewski-Szmek [Mon, 3 Jul 2017 12:29:32 +0000 (08:29 -0400)]
Parse "timeout=0" as infinity in various generators (#6264)
This extends
2d79a0bbb9f651656384a0a86ed814e6306fb5dd to the kernel
command line parsing.
The parsing is changed a bit to only understand "0" as infinity. If units are
specified, parse normally, e.g. "0s" is just 0. This makes it possible to
provide a zero timeout if necessary.
Simple test is added.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1462378.
Lennart Poettering [Mon, 3 Jul 2017 09:47:30 +0000 (11:47 +0200)]
Merge pull request #6235 from mbiebl/var-log-lastlog
tmpfiles: create /var/log/lastlog if it does not exist
Lennart Poettering [Mon, 3 Jul 2017 09:40:42 +0000 (11:40 +0200)]
Merge pull request #6233 from keszybz/man-locale-vconsole
Small doc updates for 00-keyboard.conf, vconsole.conf, locale.conf
Lennart Poettering [Mon, 3 Jul 2017 09:22:38 +0000 (11:22 +0200)]
git-contrib: drop weird non-breaking spaces
For some reason git shortlog spits out non-breaking spaces, let's remove
that, as for our purposes (inclusion in NEWS) we really want breaking
(i.e. normal) spaces.
Lennart Poettering [Mon, 3 Jul 2017 09:20:04 +0000 (11:20 +0200)]
resolved: downgrade log messages about switching DNS servers
As suggested in:
https://github.com/systemd/systemd/commit/
496ae8c84b2d3622bc767a727e3582e2b6bcffcd#commitcomment-
22819483
Let's drop some noise from the logs, as switching between DNS servers is
definitely useful for debugging, but shouldn't get more attention that
that.
Lennart Poettering [Mon, 3 Jul 2017 09:19:20 +0000 (11:19 +0200)]
NEWS: tweak contributors list a bit
Let's add more .mailmap entries to clean up GitHub's mess.
Lennart Poettering [Mon, 3 Jul 2017 08:48:28 +0000 (10:48 +0200)]
Merge pull request #6257 from keszybz/unnecessary-job-log
core: do not print color console message about gc-ed jobs
Lennart Poettering [Mon, 3 Jul 2017 08:43:00 +0000 (10:43 +0200)]
Merge pull request #6218 from poettering/v234-pre
preparation for v234