[Xen-changelog] [xen stable-4.2] libxl: Do not generate short block in libxl__datacopier_prefixdata

[patchbot@xxxxxxx]

commit 9c8a417228ce5a9175047adafd2ae10100ca14f3
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Tue Sep 3 13:41:46 2013 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon Nov 25 13:49:32 2013 +0000

    libxl: Do not generate short block in libxl__datacopier_prefixdata
    
    libxl__datacopier_prefixdata would prepend a deliberately short block
    (not just a half-full one, but one with a short buffer) to the
    dc->bufs queue.  However, this is wrong because datacopier_readable
    will find it and try to continue to fill it up.
    
    Instead, allocate a full-sized buffer.
    
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Tested-by: Chunyan Liu <cyliu@xxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    (cherry picked from commit f6d2a87f051456bddb7a47922c8cf60f37073063)
    (cherry picked from commit 841a5a5aca13255e7006e19eb880eaf6df143ac2)
---
 tools/libxl/libxl_aoutils.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c
index 983a60a..b4eb6e5 100644
--- a/tools/libxl/libxl_aoutils.c
+++ b/tools/libxl/libxl_aoutils.c
@@ -89,7 +89,7 @@ void libxl__datacopier_prefixdata(libxl__egc *egc, 
libxl__datacopier_state *dc,
 
     assert(len < dc->maxsz - dc->used);
 
-    buf = libxl__zalloc(NOGC, sizeof(*buf) - sizeof(buf->buf) + len);
+    buf = libxl__zalloc(NOGC, sizeof(*buf));
     buf->used = len;
     memcpy(buf->buf, data, len);
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog