vfio/type1: prevent underflow of locked_vm via exec()
commit046eca5018
upstream. When a vfio container is preserved across exec, the task does not change, but it gets a new mm with locked_vm=0, and loses the count from existing dma mappings. If the user later unmaps a dma mapping, locked_vm underflows to a large unsigned value, and a subsequent dma map request fails with ENOMEM in __account_locked_vm. To avoid underflow, grab and save the mm at the time a dma is mapped. Use that mm when adjusting locked_vm, rather than re-acquiring the saved task's mm, which may have changed. If the saved mm is dead, do nothing. locked_vm is incremented for existing mappings in a subsequent patch. Fixes:73fa0d10d0
("vfio: Type1 IOMMU implementation") Cc: stable@vger.kernel.org Signed-off-by: Steve Sistare <steven.sistare@oracle.com> Reviewed-by: Kevin Tian <kevin.tian@intel.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Link: https://lore.kernel.org/r/1675184289-267876-3-git-send-email-steven.sistare@oracle.com Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
2fd6f6c8cb
Коммит
eafb81c50d
|
@ -100,6 +100,7 @@ struct vfio_dma {
|
|||
struct task_struct *task;
|
||||
struct rb_root pfn_list; /* Ex-user pinned pfn list */
|
||||
unsigned long *bitmap;
|
||||
struct mm_struct *mm;
|
||||
};
|
||||
|
||||
struct vfio_batch {
|
||||
|
@ -424,8 +425,8 @@ static int vfio_lock_acct(struct vfio_dma *dma, long npage, bool async)
|
|||
if (!npage)
|
||||
return 0;
|
||||
|
||||
mm = async ? get_task_mm(dma->task) : dma->task->mm;
|
||||
if (!mm)
|
||||
mm = dma->mm;
|
||||
if (async && !mmget_not_zero(mm))
|
||||
return -ESRCH; /* process exited */
|
||||
|
||||
ret = mmap_write_lock_killable(mm);
|
||||
|
@ -798,8 +799,8 @@ static int vfio_pin_page_external(struct vfio_dma *dma, unsigned long vaddr,
|
|||
struct mm_struct *mm;
|
||||
int ret;
|
||||
|
||||
mm = get_task_mm(dma->task);
|
||||
if (!mm)
|
||||
mm = dma->mm;
|
||||
if (!mmget_not_zero(mm))
|
||||
return -ENODEV;
|
||||
|
||||
ret = vaddr_get_pfns(mm, vaddr, 1, dma->prot, pfn_base, pages);
|
||||
|
@ -809,7 +810,7 @@ static int vfio_pin_page_external(struct vfio_dma *dma, unsigned long vaddr,
|
|||
ret = 0;
|
||||
|
||||
if (do_accounting && !is_invalid_reserved_pfn(*pfn_base)) {
|
||||
ret = vfio_lock_acct(dma, 1, true);
|
||||
ret = vfio_lock_acct(dma, 1, false);
|
||||
if (ret) {
|
||||
put_pfn(*pfn_base, dma->prot);
|
||||
if (ret == -ENOMEM)
|
||||
|
@ -1179,6 +1180,7 @@ static void vfio_remove_dma(struct vfio_iommu *iommu, struct vfio_dma *dma)
|
|||
vfio_unmap_unpin(iommu, dma, true);
|
||||
vfio_unlink_dma(iommu, dma);
|
||||
put_task_struct(dma->task);
|
||||
mmdrop(dma->mm);
|
||||
vfio_dma_bitmap_free(dma);
|
||||
if (dma->vaddr_invalid) {
|
||||
iommu->vaddr_invalid_count--;
|
||||
|
@ -1649,29 +1651,15 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,
|
|||
* against the locked memory limit and we need to be able to do both
|
||||
* outside of this call path as pinning can be asynchronous via the
|
||||
* external interfaces for mdev devices. RLIMIT_MEMLOCK requires a
|
||||
* task_struct and VM locked pages requires an mm_struct, however
|
||||
* holding an indefinite mm reference is not recommended, therefore we
|
||||
* only hold a reference to a task. We could hold a reference to
|
||||
* current, however QEMU uses this call path through vCPU threads,
|
||||
* which can be killed resulting in a NULL mm and failure in the unmap
|
||||
* path when called via a different thread. Avoid this problem by
|
||||
* using the group_leader as threads within the same group require
|
||||
* both CLONE_THREAD and CLONE_VM and will therefore use the same
|
||||
* mm_struct.
|
||||
*
|
||||
* Previously we also used the task for testing CAP_IPC_LOCK at the
|
||||
* time of pinning and accounting, however has_capability() makes use
|
||||
* of real_cred, a copy-on-write field, so we can't guarantee that it
|
||||
* matches group_leader, or in fact that it might not change by the
|
||||
* time it's evaluated. If a process were to call MAP_DMA with
|
||||
* CAP_IPC_LOCK but later drop it, it doesn't make sense that they
|
||||
* possibly see different results for an iommu_mapped vfio_dma vs
|
||||
* externally mapped. Therefore track CAP_IPC_LOCK in vfio_dma at the
|
||||
* time of calling MAP_DMA.
|
||||
* task_struct. Save the group_leader so that all DMA tracking uses
|
||||
* the same task, to make debugging easier. VM locked pages requires
|
||||
* an mm_struct, so grab the mm in case the task dies.
|
||||
*/
|
||||
get_task_struct(current->group_leader);
|
||||
dma->task = current->group_leader;
|
||||
dma->lock_cap = capable(CAP_IPC_LOCK);
|
||||
dma->mm = current->mm;
|
||||
mmgrab(dma->mm);
|
||||
|
||||
dma->pfn_list = RB_ROOT;
|
||||
|
||||
|
@ -3168,9 +3156,8 @@ static int vfio_iommu_type1_dma_rw_chunk(struct vfio_iommu *iommu,
|
|||
!(dma->prot & IOMMU_READ))
|
||||
return -EPERM;
|
||||
|
||||
mm = get_task_mm(dma->task);
|
||||
|
||||
if (!mm)
|
||||
mm = dma->mm;
|
||||
if (!mmget_not_zero(mm))
|
||||
return -EPERM;
|
||||
|
||||
if (kthread)
|
||||
|
|
Загрузка…
Ссылка в новой задаче