fix(logind): be tolerant if we failed to remove leader from hashmap - #418
Open
deepin-ci-robot wants to merge 1 commit into
Conversation
If something wrong happened before hashmap_put(), session_free() may be called through gc logic, and the assertion is triggered. Changes: - Add debian/patches/fix-logind-tolerate-leader-hashmap-removal-failure.patch - Modify debian/patches/series - Modify debian/changelog Upstream: systemd/systemd@889975b 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
In
session_reset_leader(), logind used a strictassert_se(hashmap_remove_value(...))when removing a session's leader PID from the manager'ssessions_by_leaderhashmap. If something went wrong beforehashmap_put()(i.e. the leader was never registered in the hashmap),session_free()could still be called through GC logic, and the assertion would trigger, aborting systemd-logind.What This PR Changes
Backports upstream systemd commit 889975bb00a0db26a30bee967df319df7605fd95 (PR systemd/systemd#30610): the strict assertion on
hashmap_remove_value()insession_reset_leader()is replaced with a tolerant(void)cast, so a missing leader entry in the hashmap no longer crashes logind during session cleanup.Problem Solved After the Change
session_free()no longer aborts systemd-logind when the session leader was never put into thesessions_by_leaderhashmap, making session cleanup robust against earlier failures.Changes
Upstream
systemd/systemd@889975b
Generated-By: glm-5.3-flash
Co-Authored-By: deepin-ci-robot packages@deepin.org