From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Rusty Russell <rusty@rustcorp.com.au>,
virtualization@lists.linux-foundation.org, kvm@vger.kernel.org
Subject: [PATCH] virtio_rng: dont use vmalloced addresses for virtio
Date: Mon, 26 May 2008 16:25:28 +0200 [thread overview]
Message-ID: <200805261625.28419.borntraeger@de.ibm.com> (raw)
If virtio_rng is build as a module, random_data is an address in vmalloc
space. As virtio expects guest real addresses, this can cause any kind of
funny behaviour, so lets allocate random_data dynamically with kmalloc.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
drivers/char/hw_random/virtio-rng.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
Index: kvm/drivers/char/hw_random/virtio-rng.c
===================================================================
--- kvm.orig/drivers/char/hw_random/virtio-rng.c
+++ kvm/drivers/char/hw_random/virtio-rng.c
@@ -27,7 +27,7 @@
* give it 64 bytes at a time, and the hwrng framework takes it 4 bytes at a
* time. */
static struct virtqueue *vq;
-static u32 random_data[16];
+static u32 *random_data;
static unsigned int data_left;
static DECLARE_COMPLETION(have_data);
@@ -47,9 +47,9 @@ static void register_buffer(void)
{
struct scatterlist sg;
- sg_init_one(&sg, &random_data, sizeof(random_data));
+ sg_init_one(&sg, random_data, 64);
/* There should always be room for one buffer. */
- if (vq->vq_ops->add_buf(vq, &sg, 0, 1, &random_data) != 0)
+ if (vq->vq_ops->add_buf(vq, &sg, 0, 1, random_data) != 0)
BUG();
vq->vq_ops->kick(vq);
}
@@ -128,11 +128,15 @@ static struct virtio_driver virtio_rng =
static int __init init(void)
{
+ random_data = kmalloc(64, GFP_KERNEL);
+ if (!random_data)
+ return -ENOMEM;
return register_virtio_driver(&virtio_rng);
}
static void __exit fini(void)
{
+ kfree(random_data);
unregister_virtio_driver(&virtio_rng);
}
module_init(init);
next reply other threads:[~2008-05-26 14:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-26 14:25 Christian Borntraeger [this message]
2008-05-27 1:26 ` [PATCH] virtio_rng: dont use vmalloced addresses for virtio Rusty Russell
2008-05-27 6:31 ` Christian Borntraeger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200805261625.28419.borntraeger@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox