From nobody Sun May 19 16:27:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1588909517; cv=none; d=zohomail.com; s=zohoarc; b=As4Kb3dL3Axs5DBAR/lWqzqcX9pTyIA+iajzVx3JlYgzW9DdyIjC0SOxFF9hT7DWSZ3ogVVVTTFW+Kqn+3/Ro6oxbr054+RsRplbrxQ5pHr3MBmWrZ+WIBlaYSa9JjT0vMKxz2uVg/cfIV0XkFN+MOL9Bu6fj5Irc/vSE13N6JQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588909517; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=59TqwgQ1Z2KJ8b9Q36Av/r+1yo+YJRzy7wJkKXIlUqk=; b=fy1ur+9aZWI7ZN/puQWiKG+Cx/LgQzoRa1rgpGMe77ZAUx37ifXPqutmCmessweE8oxWU4/F7QofbLAZ0Eq2/GaG4LlIHrUEsB9PWd39cGB/qH0nRUmsO57Wj8nlPOP/bP6sDaPEJXyR9+sPpEE7eXUdZClsScIuM+bzVndEqKw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588909517531666.6899888040577; Thu, 7 May 2020 20:45:17 -0700 (PDT) Received: from localhost ([::1]:34562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWtwq-0006tR-6h for importer@patchew.org; Thu, 07 May 2020 23:45:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWtvj-0004zf-Nh for qemu-devel@nongnu.org; Thu, 07 May 2020 23:44:07 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:40706 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 1jWtve-0007R4-Np for qemu-devel@nongnu.org; Thu, 07 May 2020 23:44:07 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id E4037CA2D08D53CF4EAC; Fri, 8 May 2020 11:43:58 +0800 (CST) Received: from opensource.huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Fri, 8 May 2020 11:43:52 +0800 From: Pan Nengyuan To: , Subject: [PATCH 1/2] migration/rdma: fix potential nullptr access in rdma_start_incoming_migration Date: Fri, 8 May 2020 06:07:54 -0400 Message-ID: <20200508100755.7875-2-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200508100755.7875-1-pannengyuan@huawei.com> References: <20200508100755.7875-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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/05/07 23:43:59 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.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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, Pan Nengyuan , qemu-devel@nongnu.org, euler.robot@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 'rdma' is NULL when taking the first error branch in rdma_start_incoming_mi= gration. And it will cause a null pointer access in label 'err'. Fix that. Fixes: 59c59c67ee6b0327ae932deb303caa47919aeb1e Signed-off-by: Pan Nengyuan Reviewed-by: Juan Quintela --- migration/rdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/rdma.c b/migration/rdma.c index 967fda5b0c..72e8b1c95b 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -4056,7 +4056,9 @@ void rdma_start_incoming_migration(const char *host_p= ort, Error **errp) return; err: error_propagate(errp, local_err); - g_free(rdma->host); + if (rdma) { + g_free(rdma->host); + } g_free(rdma); g_free(rdma_return_path); } --=20 2.18.2 From nobody Sun May 19 16:27:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1588909606; cv=none; d=zohomail.com; s=zohoarc; b=Qy2TjLN8K6DXUFZMulo2iaCRNYa56WdcGqPkxTylCR2tfeVVNY3Qs4NUjqXOFQIey9TRsonUOks7yjCwwZ4ZCdomqlKshdjOFa5QRRVaAAeKLlOBBkQWeO+dI15EU8Ppnx6B0usp1IomTXIlmlY2SlcT0dLJJCVxekbtMD31T0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588909606; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bCkMtb1FGvAjMHlF581Mv9fS3HyKWPln4O0+ooKviKg=; b=YKShzQN/a1T2WGxuOkeDw+LHPgWuaopxCtJnElQ/JUOKagniMI8p4WWIx2DI4tDAdbbCagLpBOCgsk+YnqWVRbSmXi6Bl9+Ndgg9KHTAlbJ5SBGc/5SGk5rMD9SQaSB9sdg3Io+VOGEgoJb0tpCaHsxKs+icalIoqLQLI1xJJsY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588909606972391.30865066103956; Thu, 7 May 2020 20:46:46 -0700 (PDT) Received: from localhost ([::1]:41902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWtyH-0001Wr-LK for importer@patchew.org; Thu, 07 May 2020 23:46:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWtvl-00053S-Oo for qemu-devel@nongnu.org; Thu, 07 May 2020 23:44:09 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:3755 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 1jWtvk-0007RS-Pn for qemu-devel@nongnu.org; Thu, 07 May 2020 23:44:09 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 00EF447EA034DFFC1136; Fri, 8 May 2020 11:44:04 +0800 (CST) Received: from opensource.huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Fri, 8 May 2020 11:43:54 +0800 From: Pan Nengyuan To: , Subject: [PATCH 2/2] migration/rdma: cleanup rdma context before g_free to avoid memleaks Date: Fri, 8 May 2020 06:07:55 -0400 Message-ID: <20200508100755.7875-3-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200508100755.7875-1-pannengyuan@huawei.com> References: <20200508100755.7875-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=pannengyuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 22:13:22 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_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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, Pan Nengyuan , qemu-devel@nongnu.org, euler.robot@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When error happen in initializing 'rdma_return_path', we should cleanup rdm= a context before g_free(rdma) to avoid some memleaks. This patch fix that. Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Reviewed-by: Juan Quintela --- migration/rdma.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 72e8b1c95b..ec45d33ba3 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -4094,20 +4094,20 @@ void rdma_start_outgoing_migration(void *opaque, rdma_return_path =3D qemu_rdma_data_init(host_port, errp); =20 if (rdma_return_path =3D=3D NULL) { - goto err; + goto return_path_err; } =20 ret =3D qemu_rdma_source_init(rdma_return_path, s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], er= rp); =20 if (ret) { - goto err; + goto return_path_err; } =20 ret =3D qemu_rdma_connect(rdma_return_path, errp); =20 if (ret) { - goto err; + goto return_path_err; } =20 rdma->return_path =3D rdma_return_path; @@ -4120,6 +4120,8 @@ void rdma_start_outgoing_migration(void *opaque, s->to_dst_file =3D qemu_fopen_rdma(rdma, "wb"); migrate_fd_connect(s, NULL); return; +return_path_err: + qemu_rdma_cleanup(rdma); err: g_free(rdma); g_free(rdma_return_path); --=20 2.18.2