From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoDXh-0001nT-Tk for qemu-devel@nongnu.org; Wed, 04 Dec 2013 09:35:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VoDXX-0002nZ-7g for qemu-devel@nongnu.org; Wed, 04 Dec 2013 09:35:09 -0500 Received: from e8.ny.us.ibm.com ([32.97.182.138]:44259) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoDXX-0002nG-1z for qemu-devel@nongnu.org; Wed, 04 Dec 2013 09:34:59 -0500 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Dec 2013 09:34:58 -0500 From: Michael Roth Date: Wed, 4 Dec 2013 08:34:18 -0600 Message-Id: <1386167679-13021-12-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 11/32] vmdk: Fix vmdk_parse_extents List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@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 (cherry picked from commit 899f1ae219d5eaa96a53c996026cb0178d62a86d) Signed-off-by: Michael Roth --- block/vmdk.c | 7 +++++-- 1 file 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; } -- 1.7.9.5