From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUeJi-000105-Lq for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUeJd-00060S-Lg for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUeJd-00060L-Ds for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:07:45 -0400 From: Kevin Wolf Date: Fri, 11 Oct 2013 17:05:49 +0200 Message-Id: <1381503951-27985-60-git-send-email-kwolf@redhat.com> In-Reply-To: <1381503951-27985-1-git-send-email-kwolf@redhat.com> References: <1381503951-27985-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 59/61] vmdk: Fix vmdk_parse_extents List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Fam Zheng 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 Signed-off-by: Kevin Wolf --- block/vmdk.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 709aa3d..5a9f278 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -772,10 +772,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; } -- 1.8.1.4