From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoDYC-0002Y2-9z for qemu-devel@nongnu.org; Wed, 04 Dec 2013 09:35:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VoDXk-0003FP-8y for qemu-devel@nongnu.org; Wed, 04 Dec 2013 09:35:40 -0500 Received: from e35.co.us.ibm.com ([32.97.110.153]:52972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoDXk-0003Ez-2O for qemu-devel@nongnu.org; Wed, 04 Dec 2013 09:35:12 -0500 Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Dec 2013 07:35:11 -0700 From: Michael Roth Date: Wed, 4 Dec 2013 08:34:39 -0600 Message-Id: <1386167679-13021-33-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1386167679-13021-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1386167679-13021-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 32/32] rng-egd: offset the point when repeatedly read from the buffer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Amos Kong 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) Signed-off-by: Michael Roth --- backends/rng-egd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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.9.5