From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYajt-0003cc-5q for qemu-devel@nongnu.org; Fri, 11 Apr 2014 08:39:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYajm-000117-Mr for qemu-devel@nongnu.org; Fri, 11 Apr 2014 08:39:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15878) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYajm-00010w-Eg for qemu-devel@nongnu.org; Fri, 11 Apr 2014 08:39:18 -0400 From: Kevin Wolf Date: Fri, 11 Apr 2014 14:39:09 +0200 Message-Id: <1397219952-26807-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1397219952-26807-1-git-send-email-kwolf@redhat.com> References: <1397219952-26807-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 1/4] bochs: Fix memory leak in bochs_open() error path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org Signed-off-by: Kevin Wolf Reviewed-by: Laszlo Ersek --- block/bochs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block/bochs.c b/block/bochs.c index 826ec12..50b84a9 100644 --- a/block/bochs.c +++ b/block/bochs.c @@ -150,11 +150,13 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags, s->extent_size = le32_to_cpu(bochs.extent); if (s->extent_size == 0) { error_setg(errp, "Extent size may not be zero"); - return -EINVAL; + ret = -EINVAL; + goto fail; } else if (s->extent_size > 0x800000) { error_setg(errp, "Extent size %" PRIu32 " is too large", s->extent_size); - return -EINVAL; + ret = -EINVAL; + goto fail; } if (s->catalog_size < bs->total_sectors / s->extent_size) { -- 1.8.3.1