summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-07-13 12:37:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-07-13 12:37:45 -0700
commit2a7e1211e130c51a2b5743ecf247645ac8e936ee (patch)
tree13de0b4ef924f459c6f2665166127cc9dd649d60
parent79facf308f4dd13b162430746117a11b3116a4da (diff)
parent498e8bf51c633cc4496343e6113f340f8e9301ae (diff)
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()
-rw-r--r--samples/vfio-mdev/mbochs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c
index d5d5a499160c..2535c3677c7b 100644
--- a/samples/vfio-mdev/mbochs.c
+++ b/samples/vfio-mdev/mbochs.c
@@ -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);