From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUVqT-0005Xf-IA for qemu-devel@nongnu.org; Fri, 11 Oct 2013 02:05:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUVqO-0002kc-Hs for qemu-devel@nongnu.org; Fri, 11 Oct 2013 02:05:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUVqO-0002kY-9Y for qemu-devel@nongnu.org; Fri, 11 Oct 2013 02:05:00 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9B64xm4025779 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 11 Oct 2013 02:04:59 -0400 From: Fam Zheng Date: Fri, 11 Oct 2013 14:04:53 +0800 Message-Id: <1381471493-6464-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH] vmdk: Fix vmdk_parse_extents List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com 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@nongnu.org Signed-off-by: Fam Zheng --- block/vmdk.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 5d56e31..f2dda21 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -760,10 +760,13 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, } next_line: /* move to next line */ - while (*p && *p != '\n') { + while (*p) { p++; + if (*p == '\n') { + p++; + break; + } } - p++; } return 0; } -- 1.8.3.1