Library: fix race conditions in device management - #687
Open
reinauer wants to merge 1 commit into
Open
Conversation
The _sysfs_path_to_id_map and _backlog structures were being accessed concurrently by the main thread and the uevent thread without proper synchronization. This could lead to memory corruption or erroneous device rejections during the initial system scanning phase. Fix this by: 1. Protecting _sysfs_path_to_id_map in DeviceManagerBase using the existing refDeviceMapMutex(). 2. Protecting the event _backlog in UEventDeviceManager using a dedicated static mutex to ensure thread-safe buffering and handoff.
Cropi
requested changes
Aug 31, 2026
Cropi
left a comment
Member
There was a problem hiding this comment.
Good direction, a few issues to address:
1. Deadlock in DeviceManagerBase
getIDFromSysfsPath and isPresentSysfsPath lock refDeviceMapMutex() then call knownSysfsPath(), which locks the same mutex again. std::mutex isn't recursive so this deadlocks. knownSysfsPath should be an internal unlocked helper.
2. Exception safety in backlog locking
Raw pthread_mutex_lock/unlock around emplace_back isn't safe — if it throws, the mutex stays locked. Use a member std::mutex with std::lock_guard instead.
3. Static mutex over instance data (minor)
G_backlog_mutex is static but _backlog is per-instance. No real issue since there's only ever one instance, but a member mutex would be cleaner.
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
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.
The _sysfs_path_to_id_map and _backlog structures were being accessed
concurrently by the main thread and the uevent thread without proper
synchronization. This could lead to memory corruption or erroneous
device rejections during the initial system scanning phase.
Fix this by:
existing refDeviceMapMutex().
dedicated static mutex to ensure thread-safe buffering and handoff.