From patchwork Mon Jan 28 21:14:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 216386 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 66C582C009C for ; Tue, 29 Jan 2013 09:21:10 +1100 (EST) Received: from localhost ([::1]:40876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tzx4e-00006V-B5 for incoming@patchwork.ozlabs.org; Mon, 28 Jan 2013 17:21:08 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tzx4W-00005r-PA for qemu-devel@nongnu.org; Mon, 28 Jan 2013 17:21:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tzx4V-00053W-Na for qemu-devel@nongnu.org; Mon, 28 Jan 2013 17:21:00 -0500 Received: from mail-ia0-x22b.google.com ([2607:f8b0:4001:c02::22b]:55759) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tzx4V-00053Q-Fm for qemu-devel@nongnu.org; Mon, 28 Jan 2013 17:20:59 -0500 Received: by mail-ia0-f171.google.com with SMTP id z13so5011232iaz.2 for ; Mon, 28 Jan 2013 14:20:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=qPfnrMWSLfBSGut9D/HQgXTmI1KQWn8LHWnERC42gyw=; b=ZVEEL5WsrlMo/Sx/7F2kuc7Z8HmFRgZShUaARS8Vvy409Yq+2Kg9PqBtdXFiXzDstb gs7CCW5qp7fXvdC2KZoYxJ3ZQ2pNXYHAHFYkrbOT2/ctv8PFT9jzOxuqg9ePXGtvzvjS t7R84GXStYVHW38fFMWAOVx5Br2osoDhyz8Uw/jOrVlaSuPgoMUlltWzsmysmtiyQmyl zDAbKLSuRmByehf+/5YURub9zSpVSTF+pIlc7XfchxVZ6rVXDN4zsPje7U+EMrJ0daWA dQnfJKDhxin290sD52iEksr58XctS3Ncb3flZr9pm7JRtpdjcr5eXc8PfL3ZExQH6pwh /l9w== X-Received: by 10.50.169.6 with SMTP id aa6mr1311257igc.1.1359407740625; Mon, 28 Jan 2013 13:15:40 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id e9sm6968975igp.11.2013.01.28.13.15.39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 28 Jan 2013 13:15:39 -0800 (PST) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 28 Jan 2013 15:14:54 -0600 Message-Id: <1359407695-17792-2-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359407695-17792-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1359407695-17792-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c02::22b Cc: aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 1/2] qemu-ga: Plug memory leak in guest_fsfreeze_cleanup() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster Neglects to free errors allocated by qmp_guest_fsfreeze_thaw(). Spotted by Coverity. While there, drop the test whether return value is negative (it's never true), and improve logging. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Luiz Capitulino Signed-off-by: Michael Roth --- qga/commands-posix.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 0ad73f3..498f5ca 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -611,13 +611,14 @@ int64_t qmp_guest_fsfreeze_thaw(Error **err) static void guest_fsfreeze_cleanup(void) { - int64_t ret; Error *err = NULL; if (ga_is_frozen(ga_state) == GUEST_FSFREEZE_STATUS_FROZEN) { - ret = qmp_guest_fsfreeze_thaw(&err); - if (ret < 0 || err) { - slog("failed to clean up frozen filesystems"); + qmp_guest_fsfreeze_thaw(&err); + if (err) { + slog("failed to clean up frozen filesystems: %s", + error_get_pretty(err)); + error_free(err); } } }