diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-30 17:03:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-30 17:03:49 -0700 |
| commit | 7d767a9528f6d203bca5e83faf1b8f2f6af3fc07 (patch) | |
| tree | 2d808a2b0880a96b317eddd69e43b59b8297a963 /drivers/xen/gntdev-common.h | |
| parent | 2be6a7503d32eb1d60b4c9c15547a10d4ec9a934 (diff) | |
| parent | 114a2de6fa86d99ed9546cc9113a3cad58beef79 (diff) | |
Merge tag 'for-linus-6.17-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross:
- fix for a UAF in the xen gntdev-dmabuf driver
- fix in the xen netfront driver avoiding spurious interrupts
- fix in the gntdev driver avoiding a large stack allocation
- cleanup removing some dead code
- build warning fix
- cleanup of the sysfs code in the xen-pciback driver
* tag 'for-linus-6.17-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/netfront: Fix TX response spurious interrupts
xen/gntdev: remove struct gntdev_copy_batch from stack
xen: fix UAF in dmabuf_exp_from_pages()
xen: Remove some deadcode (x)
xen-pciback: Replace scnprintf() with sysfs_emit_at()
xen/xenbus: fix W=1 build warning in xenbus_va_dev_error function
Diffstat (limited to 'drivers/xen/gntdev-common.h')
| -rw-r--r-- | drivers/xen/gntdev-common.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/xen/gntdev-common.h b/drivers/xen/gntdev-common.h index 9c286b2a1900..ac8ce3179ba2 100644 --- a/drivers/xen/gntdev-common.h +++ b/drivers/xen/gntdev-common.h @@ -26,6 +26,10 @@ struct gntdev_priv { /* lock protects maps and freeable_maps. */ struct mutex lock; + /* Free instances of struct gntdev_copy_batch. */ + struct gntdev_copy_batch *batch; + struct mutex batch_lock; + #ifdef CONFIG_XEN_GRANT_DMA_ALLOC /* Device for which DMA memory is allocated. */ struct device *dma_dev; |