Merge tag 'vfio-v5.0-rc2' of git://github.com/awilliam/linux-vfio (1bdbe227) · Commits · 戴 / test

Pull VFIO fixes from Alex Williamson: - Fix trace header include path for in-tree builds (Masahiro Yamada) - Fix overflow in unmap wrap-around test (Alex Williamson) * tag 'vfio-v5.0-rc2' of git://github.com/awilliam/linux-vfio: vfio/type1: Fix unmap overflow off-by-one vfio/pci: set TRACE_INCLUDE_PATH to fix the build error

drivers/vfio/pci/trace.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ TRACE_EVENT(vfio_pci_npu2_mmap,
		#endif /* _TRACE_VFIO_PCI_H */

		#undef TRACE_INCLUDE_PATH
		#define TRACE_INCLUDE_PATH .
		#define TRACE_INCLUDE_PATH ../../drivers/vfio/pci
		#undef TRACE_INCLUDE_FILE
		#define TRACE_INCLUDE_FILE trace

drivers/vfio/vfio_iommu_type1.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -878,7 +878,7 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
		return -EINVAL;
		if (!unmap->size \|\| unmap->size & mask)
		return -EINVAL;
		if (unmap->iova + unmap->size < unmap->iova \|\|
		if (unmap->iova + unmap->size - 1 < unmap->iova \|\|
		unmap->size > SIZE_MAX)
		return -EINVAL;

Admin message