From patchwork Mon Aug 31 13:43:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Nengyuan X-Patchwork-Id: 11745625 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 105F91709 for ; Mon, 31 Aug 2020 07:18:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1506206F0 for ; Mon, 31 Aug 2020 07:18:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1506206F0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:33248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCe4w-0004HI-UX for patchwork-qemu-devel@patchwork.kernel.org; Mon, 31 Aug 2020 03:18:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCe48-0002cA-U9 for qemu-devel@nongnu.org; Mon, 31 Aug 2020 03:17:20 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:40250 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCe45-0005tE-Hc for qemu-devel@nongnu.org; Mon, 31 Aug 2020 03:17:20 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 91F719EBF7DE780F5464; Mon, 31 Aug 2020 15:17:10 +0800 (CST) Received: from opensource.huawei.com (10.175.100.152) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Mon, 31 Aug 2020 15:17:04 +0800 From: Pan Nengyuan To: Subject: [PATCH v2 07/10] migration/colo: Plug memleaks in colo_process_incoming_thread Date: Mon, 31 Aug 2020 09:43:12 -0400 Message-ID: <20200831134315.1221-8-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200831134315.1221-1-pannengyuan@huawei.com> References: <20200831134315.1221-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.152] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.32; envelope-from=pannengyuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:17:11 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DATE_IN_FUTURE_06_12=1.947, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, Juan Quintela , Pan Nengyuan , "Dr. David Alan Gilbert" , euler.robot@huawei.com, kuhn.chenqun@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 'local_err' forgot to free in colo_process_incoming_thread error path. Fix that. Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Reviewed-by: Li Qiang --- Cc: Hailiang Zhang Cc: Juan Quintela Cc: "Dr. David Alan Gilbert" --- - V2: Arrange all 'error_report_err' in 'out' label(suggested by Li Qiang). --- migration/colo.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/migration/colo.c b/migration/colo.c index ea7d1e9d4e..2288188fe2 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -888,7 +888,6 @@ void *colo_process_incoming_thread(void *opaque) while (mis->state == MIGRATION_STATUS_COLO) { colo_wait_handle_message(mis, fb, bioc, &local_err); if (local_err) { - error_report_err(local_err); break; } @@ -924,6 +923,10 @@ out: qemu_fclose(fb); } + if (local_err) { + error_report_err(local_err); + } + /* Hope this not to be too long to loop here */ qemu_sem_wait(&mis->colo_incoming_sem); qemu_sem_destroy(&mis->colo_incoming_sem);