v253 batch #408
Merged
v253 batch #408
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This adds checks for the kernel bug caused by torvalds/linux@3ddc223, it will be fixed by https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/ (cherry picked from commit d22f2fb) (cherry picked from commit 90fda85)
… destroy a curl context on exit If we destroy both an event loop and a curl contect object at the same time, then we get into this weird situation where curl wants us to reconfigure a timout event source right before destruction, which sd-event will refuse however, since it is already being shutdown. Hence, catch that and simply don't bother adjusting the timeout, since we cannot get back from there anyway. (cherry picked from commit c5ecf09) (cherry picked from commit 73164d4) (cherry picked from commit e892472)
Follow-up for 6c2d47d. Fixes the following unexpected skip: ``` [ 6.163670] TEST-64-UDEV-STORAGE.sh[596]: + modinfo btrfs [ 6.164102] TEST-64-UDEV-STORAGE.sh[726]: /usr/lib/systemd/tests/testdata/units/TEST-64-UDEV-STORAGE.sh: line 726: modinfo: command not found [ 6.164683] TEST-64-UDEV-STORAGE.sh[727]: + echo 'This test requires the btrfs kernel module but it is not installed, skipping the test' [ 6.165069] TEST-64-UDEV-STORAGE.sh[728]: + tee --append /skipped [ 6.166801] TEST-64-UDEV-STORAGE.sh[728]: This test requires the btrfs kernel module but it is not installed, skipping the test [ 6.167177] TEST-64-UDEV-STORAGE.sh[596]: + exit 77 ``` (cherry picked from commit 2569e79) (cherry picked from commit 0868f29) (cherry picked from commit 911a593)
The rationale is similar to 40e1f4e. Currently, we only pass TTYPath=/dev/pts/... to the transient service spawned by systemd-run. This is a bit problematic though, when ExecStartPre= or ExecStopPost= is used. Since when these control processes get to run, the main process is not yet started/has already exited, hence the slave suffers from the same vhangup problem as the mentioned commit. By passing the slave fd in, the service manager will hold the fd open as long as the service is alive. Fixes #32916 (cherry picked from commit 28459ba) (cherry picked from commit 182b80b) (cherry picked from commit 369d7d4)
…he main interface is called Previously, Image objects were only cached when reading properties or methods in the org.freedesktop.machine1.Image interface are called. This makes that, when a method in the main interface (org.freedesktop.machine1) for an image is called, also acquire the Image object from the cache, and if not cached, create Image object and put into the cache, like we do for org.freedesktop.machine1.Image. Otherwise, if some properties of an image are updated by methods in the main interface, e.g. MarkImageReadOnly(), the changes do not applied to the cached Image object, and subsequent read of proerties through the interface for the image, e.g. ReadOnly property, may provide outdated values. Follow-up for 1ddb263. Fixes #32888. (cherry picked from commit c6aeb9b) (cherry picked from commit bf270a3) (cherry picked from commit a898cb9)
Fixes a bug introduced by 1ddb263. Note, this requires the previous two commits, and cannot backport without them. Note, before the previous commit, the use-after-free could be triggered only by Rename() DBus method, and could not by RenameImage(), as we did not cache Image object when RenameImage() method is called. And machinectl always uses RenameImage(). Hence, the issue could be triggered only when Rename() DBus method is explicitly called by e.g. busctl. With the previous commit, the Image object passed to the function is always cached. Hence, the issue could be triggered even with machinectl command, and this fix is important. (cherry picked from commit 3b1b2d4) (cherry picked from commit c937169) (cherry picked from commit 3102599)
Due to the bug in kernel 6.9 caused by torvalds/linux@8debcf5, the net_id udev builtin does not work for netdevsim interface. So, eni99np1 cannot be used with kernel 6.9 anymore. Workaround for #32910. (cherry picked from commit f1f1be7) (cherry picked from commit 221b278) (cherry picked from commit 64719b5)
Fixes systemd/systemd#32932 (comment). (cherry picked from commit f8ef1df) (cherry picked from commit d6f9c7b) (cherry picked from commit 87054dc)
Follow-up for ade0789 The change in behavior was partly intentional, as I think if both --wait and --pty are used, manually disconnecting from PTY forwarder should not result in systemd-run exiting with "Finished with ..." log. But we should check for --wait here. Closes #32953 (cherry picked from commit 2b4a691) (cherry picked from commit 4656130) (cherry picked from commit 4e89a41)
Fixes systemd/systemd#32680 (comment). === May 21 02:45:08 TEST-74-AUX-UTILS.sh[2475]: + mountpoint /tmp/tmp.eaRV7lSbX2/mnt May 21 02:45:08 TEST-74-AUX-UTILS.sh[2476]: /tmp/tmp.eaRV7lSbX2/mnt is not a mountpoint May 21 02:45:08 TEST-74-AUX-UTILS.sh[2449]: + systemd-mount /dev/loop0 /tmp/tmp.eaRV7lSbX2/mnt May 21 02:45:08 systemd-mount[2477]: Failed to start transient mount unit: Unit tmp-tmp.eaRV7lSbX2-mnt.mount was already loaded or has a fragment file. === (cherry picked from commit 4a8ca3c) (cherry picked from commit 1a6a2d8) (cherry picked from commit 861affe)
Hopefully fixes issue like systemd/systemd#32680 (comment) systemd/systemd#32680 (comment) (cherry picked from commit e504f5a) (cherry picked from commit 53a26a6) (cherry picked from commit d080d3d)
On running cryptsetup, udevd detects two inotify events for the underlying device. Running the test on enough fast host, the expected symlinks based on UUID and disk label are created by the second event. During processing a uevent for a device, udevd disables the inotify watch for the device. If the test runs on slow system, the second inotify event may comes during a udev worker processing the synthesized uevent triggered by the first inotify event. Hence, no synthesized uevent for the second inotify event will be generated, and the expected symlinks will be never created. To prevent the issue, we need to lock the device during cryptsetup command is running. Fixes #32913. (cherry picked from commit be43c9b) (cherry picked from commit 640dbad) (cherry picked from commit b88915b)
When running in LXC with AppArmor we'll most likely get an error when creating a network namespace due to a kernel regression in < v6.2 affecting AppArmor, resulting in denials. Like other tests, avoid failing in case of permission issues and handle it gracefully. (cherry picked from commit 6ab21f2) (cherry picked from commit ff35460) (cherry picked from commit c3aa100)
See also: https://lore.kernel.org/r/[email protected] (cherry picked from commit 100bed7) (cherry picked from commit 41fb19e) (cherry picked from commit 6426323)
With torvalds/linux@430cc5d, the value of GENHD_FL_NO_PART, previously named as GENHD_FL_NO_PART_SCAN, is changed from 0x0200 to 0x0004. So, we need to check both flags. (cherry picked from commit f0c2668) (cherry picked from commit 49b0f0e) (cherry picked from commit 7f19a34)
With torvalds/linux@b9684a7 (v5.19), we cannot check partition scanning is enabled for a loopback block device without checking the attribute. (cherry picked from commit bab8c85) (cherry picked from commit ae7a07b) (cherry picked from commit e2fe7d8)
… namespace Denials from AppArmor are raised as EACCES, so EPERM is not enough. Do the same check as PrivateNetwork above. Fixes systemd/systemd#31037 Related to 06384eb (cherry picked from commit cafe40e) (cherry picked from commit e481710) (cherry picked from commit da9a6a5)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.