From nobody Sun May 19 11:37:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562118217; cv=none; d=zoho.com; s=zohoarc; b=ggTWVvMOx0CPGfOQmojC108qiToexiSE+gYOVdUZXPUD5/ISmahZ3smWv/wAh9gHGyN7OGkuAm+HzTD3klaOeOw2alV0hhOEg6Gg7PiQbAnaYFF8eW7i4Yeo8EZubpHjWbjX4aZQwui4gb9/2w4xpCMkAqaA8RCcPI2S69vBNxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562118217; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=gPI7WANShVme7L7vNtbB8CyMKVH8dTEN0kmzz4P/9/8=; b=UC2pwX6217UlQGQ115NuOi3DD79JcgtEiEKNXS8Y40aWIx6oPdDeIQ3IKh0bLJB3n54wRKUj7RU5TeTdMqJyrvFq0XPTpcAmrlHBZeg/fkMcbGNuHtLQt6n+0Fhc3YQFtnffEoSQW3nRbEetx+eml0SDqfTYkZ6kxZEcP5kb3b8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562118217255101.14846145288391; Tue, 2 Jul 2019 18:43:37 -0700 (PDT) Received: from localhost ([::1]:58622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiUJ3-0006wt-7B for importer@patchew.org; Tue, 02 Jul 2019 21:43:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43922) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiUIZ-0006YE-5T for qemu-devel@nongnu.org; Tue, 02 Jul 2019 21:43:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiUIY-0008EO-9Q for qemu-devel@nongnu.org; Tue, 02 Jul 2019 21:43:03 -0400 Received: from mga05.intel.com ([192.55.52.43]:28489) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hiUIY-0008CC-0j for qemu-devel@nongnu.org; Tue, 02 Jul 2019 21:43:02 -0400 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Jul 2019 18:42:58 -0700 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga004.jf.intel.com with ESMTP; 02 Jul 2019 18:42:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,445,1557212400"; d="scan'208";a="315424488" From: Zhang Chen To: Li Zhijian , Peter Maydell , Jason Wang , qemu-dev Date: Wed, 3 Jul 2019 09:38:05 +0800 Message-Id: <20190703013805.2722-1-chen.zhang@intel.com> X-Mailer: git-send-email 2.17.GIT X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH] net/colo-compare.c: Fix memory leak and code style issue. 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 Chen , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Zhang Chen Address Peter's comments in patch "COLO-compare:Add colo-compare remote notify support". Signed-off-by: Zhang Chen Reported-by: Coverity (CID 1402785) --- net/colo-compare.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 909dd6c6eb..363b1edd11 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -1008,21 +1008,20 @@ static void compare_notify_rs_finalize(SocketReadSt= ate *notify_rs) { CompareState *s =3D container_of(notify_rs, CompareState, notify_rs); =20 - /* Get Xen colo-frame's notify and handle the message */ - char *data =3D g_memdup(notify_rs->buf, notify_rs->packet_len); - char msg[] =3D "COLO_COMPARE_GET_XEN_INIT"; + const char msg[] =3D "COLO_COMPARE_GET_XEN_INIT"; int ret; =20 - if (!strcmp(data, "COLO_USERSPACE_PROXY_INIT")) { + if (!strcmp((char *)notify_rs->buf, "COLO_USERSPACE_PROXY_INIT")) { ret =3D compare_chr_send(s, (uint8_t *)msg, strlen(msg), 0, true); if (ret < 0) { error_report("Notify Xen COLO-frame INIT failed"); } - } - - if (!strcmp(data, "COLO_CHECKPOINT")) { + } else if (!strcmp((char *)notify_rs->buf, "COLO_CHECKPOINT")) { /* colo-compare do checkpoint, flush pri packet and remove sec pac= ket */ g_queue_foreach(&s->conn_list, colo_flush_packets, s); + } else { + error_report("COLO compare got unsupported instruction '%s'", + (char *)notify_rs->buf); } } =20 --=20 2.17.GIT