fix(udevadm): propagate return code from verb result - #429
Open
deepin-ci-robot wants to merge 1 commit into
Open
Conversation
udevadm swallowed the exit status of the command executed by its verbs: a failing lock operation's return code was silently discarded, so `udevadm lock <cmd>` returned success even when the underlying command (or the locking itself) failed. Propagate the verb's return code to the process exit status by switching the main function to DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(), and make `udevadm test-builtin` bail out when the builtin fails instead of masking the error. Add test coverage for `udevadm lock` exit codes. Changes: - Add debian/patches/fix-udevadm-propagate-verb-return-code.patch - Modify debian/patches/series - Modify debian/changelog Upstream: systemd/systemd@e6bca18 Generated-By: glm-5.3-flash Co-Authored-By: deepin-ci-robot <packages@deepin.org>
Contributor
Author
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
TAG Bot TAG: 255.2-4deepin68 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Problem Before the Change
udevadmdid not propagate the return code of its verbs to the process exit status. When runningudevadm lock <cmd>, a non-zero exit code of the wrapped command (or a failing lock operation) was silently swallowed, soudevadmstill exited with success. Callers relying onudevadm's exit status for device concurrency control and readiness checks could misjudge the state, leading to race conditions and inconsistent device node state.What This PR Changes
Backport of upstream systemd commit
e6bca1829657("udevadm: Propagate return code from verb result", PR #30658):src/udev/udevadm.c: switch the main function toDEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE()so the verb's return code is propagated as the process exit status instead of being clamped to success.src/udev/udevadm-test-builtin.c: makeudevadm test-builtinbail out viagoto finishwhen the builtin fails, so the error is no longer masked.test/units/testsuite-17.10.sh: add test coverage asserting thatudevadm lockreturns the wrapped command's exit code.test/units/testsuite-64.sh: initialize partition tables throughudevadm lockin the test loop.Problem Solved After the Change
udevadm lockand other verbs now correctly return the underlying command's exit code:udevadm lock --device <dev> truesucceeds whileudevadm lock --device <dev> falsefails. Scripts and systemd components can rely onudevadm's exit status for locking and readiness, preventing state misjudgment under concurrent device access.Changes
Upstream
systemd/systemd@e6bca1829657 (PR #30658)
Generated-By: glm-5.3-flash
Co-Authored-By: deepin-ci-robot packages@deepin.org