Skip to content

xen/gntdev: don't copy to user space under priv->lock - #79

Merged
kdaula merged 1 commit into
edera/mainlinefrom
kavi/cor-191-gntdev-copy-outside-lock
Nov 4, 2026
Merged

kdaula merged 1 commit into
edera/mainlinefrom
kavi/cor-191-gntdev-copy-outside-lock

Conversation

@kdaula

@kdaula kdaula commented Nov 3, 2026 •

Copy link
Copy Markdown

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

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
kdaula marked this pull request as ready for review November 3, 2026 23:58
@kdaula
kdaula requested review from azenla, kaniini and tycho November 4, 2026 00:21
@kdaula
kdaula merged commit 3f7ca89 into edera/mainline Nov 4, 2026
3 checks passed
@github-actions

github-actions Bot commented Nov 4, 2026

Copy link
Copy Markdown

Backport to edera/6.18-lts: proposed in #83

Checks and builds passed.

Run log

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants