Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758879Ab2JSNDw (ORCPT ); Fri, 19 Oct 2012 09:03:52 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:49737 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758764Ab2JSNDs (ORCPT ); Fri, 19 Oct 2012 09:03:48 -0400 From: Will Deacon To: linux-kernel@vger.kernel.org Cc: rusty@rustcorp.com.au, levinsasha928@gmail.com, Marc.Zyngier@arm.com, virtualization@lists.linux-foundation.org, akpm@linux-foundation.org, ericvh@gmail.com, Will Deacon Subject: [PATCH v2 2/3] virtio: 9p: correctly pass physical address to userspace for high pages Date: Fri, 19 Oct 2012 14:03:32 +0100 Message-Id: <1350651813-8694-2-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1350651813-8694-1-git-send-email-will.deacon@arm.com> References: <1350651813-8694-1-git-send-email-will.deacon@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1492 Lines: 45 When using a virtio transport, the 9p net device may pass the physical address of a kernel buffer to userspace via a scatterlist inside a virtqueue. If the kernel buffer is mapped outside of the linear mapping (e.g. highmem), then virt_to_page will return a bogus value and we will populate the scatterlist with junk. This patch uses kmap_to_page when populating the page array for a kernel buffer. Cc: Rusty Russell Cc: Sasha Levin Signed-off-by: Will Deacon --- net/9p/trans_virtio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 35b8911..fd05c81 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -325,7 +326,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan, int count = nr_pages; while (nr_pages) { s = rest_of_page(data); - pages[index++] = virt_to_page(data); + pages[index++] = kmap_to_page(data); data += s; nr_pages--; } -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/