Repository navigation
xen/gntdev: don't copy to user space under priv->lock - #79
Merged
Merged
Conversation
gntdev_ioctl_map_grant_ref() calls copy_to_user() with priv->lock held. A fault in that copy takes mmap_lock, while gntdev_mmap() is called with mmap_lock held and takes priv->lock, so lockdep reports a circular dependency, and a thread mapping grants can deadlock against another thread of the same process mmapping the same gntdev fd. Read the index under the lock, take an extra reference on the map, and copy after unlocking. If the copy fails, take the map off the list only if an unmap ioctl has not already done so, then drop both references. Fixes: 45ca1af ("xen/gntdev: fix error handling in ioctl") Signed-off-by: Kavi <kavi@edera.dev>
kdaula
marked this pull request as ready for review
November 3, 2026 23:58
kaniini
approved these changes
Nov 4, 2026
3 tasks done
This was referenced Nov 4, 2026
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.
gntdev_ioctl_map_grant_ref() copies its result to user space while holding priv->lock. A fault in that copy takes mmap_lock, and gntdev_mmap() runs with mmap_lock held and takes priv->lock. Lockdep reports the cycle the first time xenstored maps a new domain's ring, and two threads of one process, one mapping grants and one mmapping the same fd, can deadlock.
The copy moved under the lock in upstream 45ca1af, which fixed a leak on the copy's error path and is in master and 6.18 stable. This copies after unlocking instead, holding an extra map reference across the copy. On a failed copy it removes the map only if an unmap ioctl has not already, so the leak fix is kept.
Tested with a lockdep dom0 under Xen creating domains with this applied: the circular-dependency report no longer appears.
COR-191