From patchwork Fri Oct 23 06:12:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Qun X-Patchwork-Id: 1386525 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com 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 ozlabs.org (Postfix) with ESMTPS id 4CHYvT162zz9sRk for ; Fri, 23 Oct 2020 17:18:29 +1100 (AEDT) Received: from localhost ([::1]:52122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVqPD-00066m-5Q for incoming@patchwork.ozlabs.org; Fri, 23 Oct 2020 02:18:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVqJq-0000Cu-FT; Fri, 23 Oct 2020 02:12:54 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:47516 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 1kVqJo-0000wk-EJ; Fri, 23 Oct 2020 02:12:54 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 8E6D9956478C8FB263FF; Fri, 23 Oct 2020 14:12:45 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Fri, 23 Oct 2020 14:12:36 +0800 From: Chen Qun To: , Subject: [PATCH RESEND v2 5/7] migration/colo: Plug memleaks in colo_process_incoming_thread Date: Fri, 23 Oct 2020 14:12:16 +0800 Message-ID: <20201023061218.2080844-6-kuhn.chenqun@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20201023061218.2080844-1-kuhn.chenqun@huawei.com> References: <20201023061218.2080844-1-kuhn.chenqun@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.32; envelope-from=kuhn.chenqun@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/23 02:12:37 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: lvivier@redhat.com, zhang.zhanghailiang@huawei.com, Juan Quintela , pannengyuan@huawei.com, Li Qiang , "Dr. David Alan Gilbert" , ganqixin@huawei.com, Euler Robot , Chen Qun Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Pan Nengyuan '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 Signed-off-by: Chen Qun --- Cc: Hailiang Zhang Cc: Juan Quintela Cc: "Dr. David Alan Gilbert" --- migration/colo.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/migration/colo.c b/migration/colo.c index 3f1d3dfd95..7cc5a37192 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -886,7 +886,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; } @@ -922,6 +921,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);