From 5b3829247a3edf89ebc63e8c2be2554fd66dfd41 Mon Sep 17 00:00:00 2001 From: Amos Kong Date: Sat, 23 Nov 2013 03:48:48 +0100 Subject: [PATCH 13/14] rng-egd: offset the point when repeatedly read from the buffer RH-Author: Amos Kong Message-id: <1385178528-7953-1-git-send-email-akong@redhat.com> Patchwork-id: 55868 O-Subject: [RHEL-7.0 qemu-kvm PATCH] rng-egd: offset the point when repeatedly read from the buffer Bugzilla: 1032862 RH-Acked-by: Fam Zheng RH-Acked-by: Paolo Bonzini RH-Acked-by: Vlad Yasevich RH-Acked-by: Amit Shah RH-Acked-by: Xiao Wang Bugzilla: 1032862 Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6634396 The buffer content might be read out more than once, currently we just repeatedly read the first data block, buffer offset is missing. Cc: qemu-stable@nongnu.org Signed-off-by: Amos Kong Message-id: 1385023371-8198-3-git-send-email-akong@redhat.com Signed-off-by: Anthony Liguori (cherry picked from commit 1eb1bd9eafa890f1f4d16ef5cb8b9239a86874d9) --- backends/rng-egd.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Signed-off-by: Miroslav Rezanina --- backends/rng-egd.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/backends/rng-egd.c b/backends/rng-egd.c index 9e5a536..2962795 100644 --- a/backends/rng-egd.c +++ b/backends/rng-egd.c @@ -91,12 +91,14 @@ static int rng_egd_chr_can_read(void *opaque) static void rng_egd_chr_read(void *opaque, const uint8_t *buf, int size) { RngEgd *s = RNG_EGD(opaque); + size_t buf_offset = 0; while (size > 0 && s->requests) { RngRequest *req = s->requests->data; int len = MIN(size, req->size - req->offset); - memcpy(req->data + req->offset, buf, len); + memcpy(req->data + req->offset, buf + buf_offset, len); + buf_offset += len; req->offset += len; size -= len; -- 1.7.1