Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a7e1211 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v4.18-rc5' of git://github.com/awilliam/linux-vfio 

Pull VFIO fix from Alex Williamson:
 "Fix deadlock in mbochs sample driver (Alexey Khoroshilov)"

* tag 'vfio-v4.18-rc5' of git://github.com/awilliam/linux-vfio:
  sample: vfio-mdev: avoid deadlock in mdev_access()
parents 79facf30 498e8bf5

samples/vfio-mdev/mbochs.c

+3 −1
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ static const char *vbe_name(u32 index) 
	return "(invalid)";

}



static struct page *__mbochs_get_page(struct mdev_state *mdev_state,

				      pgoff_t pgoff);

static struct page *mbochs_get_page(struct mdev_state *mdev_state,

				    pgoff_t pgoff);
@@ -394,7 +396,7 @@ static ssize_t mdev_access(struct mdev_device *mdev, char *buf, size_t count, 
		   MBOCHS_MEMORY_BAR_OFFSET + mdev_state->memsize) {

		pos -= MBOCHS_MMIO_BAR_OFFSET;

		poff = pos & ~PAGE_MASK;

		pg = mbochs_get_page(mdev_state, pos >> PAGE_SHIFT);

		pg = __mbochs_get_page(mdev_state, pos >> PAGE_SHIFT);

		map = kmap(pg);

		if (is_write)

			memcpy(map + poff, buf, count);