Skip to content

Commit

Permalink
virtio: force vring descriptors to be allocated from lowmem
Browse files Browse the repository at this point in the history
Virtio devices may attempt to add descriptors to a virtqueue from atomic
context using GFP_ATOMIC allocation. This is problematic because such
allocations can fall outside of the lowmem mapping, causing virt_to_phys
to report bogus physical addresses which are subsequently passed to
userspace via the buffers for the virtual device.

This patch masks out __GFP_HIGH and __GFP_HIGHMEM from the requested
flags when allocating descriptors for a virtqueue. If an atomic
allocation is requested and later fails, we will return -ENOSPC which
will be handled by the driver.

Cc: [email protected]
Cc: Sasha Levin <[email protected]>
Signed-off-by: Will Deacon <[email protected]>
Signed-off-by: Rusty Russell <[email protected]>
  • Loading branch information
wildea01 authored and rustyrussell committed Oct 22, 2012
1 parent b9cdc88 commit b92b1b8
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/virtio/virtio_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,13 @@ static int vring_add_indirect(struct vring_virtqueue *vq,
unsigned head;
int i;

/*
* We require lowmem mappings for the descriptors because
* otherwise virt_to_phys will give us bogus addresses in the
* virtqueue.
*/
gfp &= ~(__GFP_HIGHMEM | __GFP_HIGH);

desc = kmalloc((out + in) * sizeof(struct vring_desc), gfp);
if (!desc)
return -ENOMEM;
Expand Down

0 comments on commit b92b1b8

Please sign in to comment.