Skip to content

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

Open
edera-rebase-app[bot] wants to merge 1 commit into
edera/6.18-ltsfrom
backport/edera-6.18-lts/pr-79
Open

edera-rebase-app[bot] wants to merge 1 commit into
edera/6.18-ltsfrom
backport/edera-6.18-lts/pr-79

Conversation

@edera-rebase-app

Copy link
Copy Markdown

Backport of #79 from edera/mainline to edera/6.18-lts (8a4c2881a70c), prepared by Claude. Run log.

Merge with Rebase and merge, so edera/6.18-lts stays linear.

Independent checks

Builds: success (x86_64 and arm64 vmlinux with the Edera features built in).

LTS tip before 8a4c2881a70c
LTS tip after 03d0f64f7890
Commits requested 1
  • New branch fast-forwards the LTS tip.
  • Backported commits are linear.
  • All 1 requested commits backported in order, each with its source's subject and identical +/- lines.

Claude's report

Claude left no report (backport step: success).

Both builds running in the background; I'll write the report once they finish.

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>
(cherry picked from commit c346741)
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.

1 participant