[Xen-changelog] [qemu-upstream-unstable] vmdk: Fix vmdk_parse_extents

[patchbot@xxxxxxx]

commit b685f6af6f3aa34a845f156b334c1e24661fd344
Author:     Fam Zheng <famz@xxxxxxxxxx>
AuthorDate: Fri Oct 11 19:48:29 2013 +0800
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Tue Dec 3 14:08:26 2013 -0600

    vmdk: Fix vmdk_parse_extents
    
    An extra 'p++' after while loop when *p == '\n' will move p to unknown
    data position, risking parsing junk data or memory access violation.
    
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Fam Zheng <famz@xxxxxxxxxx>
    Signed-off-by: Kevin Wolf <kwolf@xxxxxxxxxx>
    (cherry picked from commit 899f1ae219d5eaa96a53c996026cb0178d62a86d)
    
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 block/vmdk.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/block/vmdk.c b/block/vmdk.c
index 258a24f..dcee07a 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -755,10 +755,13 @@ static int vmdk_parse_extents(const char *desc, 
BlockDriverState *bs,
         }
 next_line:
         /* move to next line */
-        while (*p && *p != '\n') {
+        while (*p) {
+            if (*p == '\n') {
+                p++;
+                break;
+            }
             p++;
         }
-        p++;
     }
     return 0;
 }
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

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