From patchwork Fri May 20 07:57:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 9128857 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 22CFC60467 for ; Fri, 20 May 2016 07:58:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C87120120 for ; Fri, 20 May 2016 07:58:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 012C12796F; Fri, 20 May 2016 07:58:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B665F20120 for ; Fri, 20 May 2016 07:58:17 +0000 (UTC) Received: from localhost ([::1]:53617 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3fK4-0002zL-KU for patchwork-qemu-devel@patchwork.kernel.org; Fri, 20 May 2016 03:58:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3fJp-0002y2-OA for qemu-devel@nongnu.org; Fri, 20 May 2016 03:58:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3fJo-00064o-Sk for qemu-devel@nongnu.org; Fri, 20 May 2016 03:58:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45494) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3fJi-00060I-GQ; Fri, 20 May 2016 03:57:54 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BC350C04B313; Fri, 20 May 2016 07:57:53 +0000 (UTC) Received: from noname.redhat.com (ovpn-116-76.ams2.redhat.com [10.36.116.76]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4K7vqVq002582; Fri, 20 May 2016 03:57:52 -0400 From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 20 May 2016 09:57:47 +0200 Message-Id: <1463731067-7120-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 20 May 2016 07:57:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] block: Fix memory leak in bdrv_next() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP When all BDSes have already been iterated and we return NULL, the iterator must be freed, too. Signed-off-by: Kevin Wolf --- block/block-backend.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/block/block-backend.c b/block/block-backend.c index 6928d61..c5fb251 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -329,7 +329,12 @@ BdrvNextIterator *bdrv_next(BdrvNextIterator *it, BlockDriverState **bs) *bs = it->bs; } while (*bs && bdrv_has_blk(*bs)); - return *bs ? it : NULL; + if (*bs) { + return it; + } else { + g_free(it); + return NULL; + } } /*