From nobody Tue May 7 00:33:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.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; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1660035971; cv=none; d=zohomail.com; s=zohoarc; b=Au8iyf6HPua60iQQfzXeO8rJK8KO8Qx5VGAEQk5RLIaQWuieEd7D5XW+tcmRcLfjA1nr5emSBHfdnp8+QpFKctCbLfTaa3aYuUZLN2cjz2fm8TNWY0ouzZ1hfR00Sn8kZ6izxEzJeRAWylwTpUsDvW4RHfnFrjXc/puEe3jB0DU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660035971; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=JCmcXgane5hsycIG2HVmcTkrvOllYMg7N/DDv9AEfLo=; b=cbZ5Sqoy3Pf5doyqwc8zWLVQgDe0fb41cQxMCvx8FKtVwplzgmitWrB3l4uqD4CbAId1IgLvm23Nef3NIsZRDJ1BT28tSngKM8dFlpHkT+T8AynA+Gn6cHUOuujp6lz5JSKathZThia8r1hwJKAphKuwovBtdVdOm9pyVL4BM/c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1660035971111524.5474246530673; Tue, 9 Aug 2022 02:06:11 -0700 (PDT) Received: from localhost ([::1]:46686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLLBi-0007VJ-1s for importer@patchew.org; Tue, 09 Aug 2022 05:06:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLL9U-0006K3-BT for qemu-devel@nongnu.org; Tue, 09 Aug 2022 05:03:58 -0400 Received: from mga04.intel.com ([192.55.52.120]:37379) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLL9S-0004e5-7i for qemu-devel@nongnu.org; Tue, 09 Aug 2022 05:03:52 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Aug 2022 02:03:37 -0700 Received: from tkid-nvme.sh.intel.com ([10.239.161.133]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Aug 2022 02:03:36 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660035830; x=1691571830; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/ZHWix9vla6abvL5Yjgq+lBD6fTqRXgmdIanKwdK73Y=; b=Lp9j8H2G88ciDNlj8lSD1DidrbutVgIDXHmD87EwYZj5MEhUQhMqxufT r0K5exon3AMC1H+3vLbtKuQHxAtgiSKu5WMbWed9RXYAhtzTjEwXM0Qec JuGbIpJKGjkHUlg8FyumD/dR7BZmuv/oxYnW+RloNbkGq5ml3/WwxaiPW CJZqoWDzXUA7Lvvhmp13bQljZzBOqiN6deyq5oMIPZEx3tWsJxvfJ0vuY H1vjHS3QxwYn2UKixpgoZhep/3Eaxsidhupn5Q1QwwFngbjRxRTa7ATql VNVMmWFLUMXGW3sHj3hYl0qHmjDqWKgLZhoqtcD987uCgPRkCRiButCIc g==; X-IronPort-AV: E=McAfee;i="6400,9594,10433"; a="289546198" X-IronPort-AV: E=Sophos;i="5.93,224,1654585200"; d="scan'208";a="289546198" X-IronPort-AV: E=Sophos;i="5.93,224,1654585200"; d="scan'208";a="664359334" From: Zhang Chen To: Jason Wang , Peter Maydell , Li Zhijian , qemu-dev Cc: Zhang Chen Subject: [PATCH V4 RESEND] net/colo.c: Fix the pointer issue reported by Coverity. Date: Tue, 9 Aug 2022 16:48:54 +0800 Message-Id: <20220809084854.217943-1-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=192.55.52.120; envelope-from=chen.zhang@intel.com; helo=mga04.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1660035973258100001 Content-Type: text/plain; charset="utf-8" When enabled the virtio-net-pci, guest network packet will load the vnet_hdr. In COLO status, the primary VM's network packet maybe redirect to another VM, it need filter-redirect enable the vnet_hdr flag at the same time, COLO-proxy will correctly parse the original network packet. If have any misconfiguration here, the vnet_hdr_len is wrong for parse the packet, the data+offset will point to wrong place. Signed-off-by: Zhang Chen --- net/colo.c | 18 ++++++++++-------- net/colo.h | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/net/colo.c b/net/colo.c index 6b0ff562ad..2b5568fff4 100644 --- a/net/colo.c +++ b/net/colo.c @@ -44,21 +44,23 @@ int parse_packet_early(Packet *pkt) { int network_length; static const uint8_t vlan[] =3D {0x81, 0x00}; - uint8_t *data =3D pkt->data + pkt->vnet_hdr_len; + uint8_t *data =3D pkt->data; uint16_t l3_proto; ssize_t l2hdr_len; =20 - if (data =3D=3D NULL) { - trace_colo_proxy_main_vnet_info("This packet is not parsed correct= ly, " + assert(data); + + /* Check the received vnet_hdr_len then add the offset */ + if ((pkt->vnet_hdr_len > sizeof(struct virtio_net_hdr_v1_hash)) || + (pkt->size < sizeof(struct eth_header) + sizeof(struct vlan_header) + + pkt->vnet_hdr_len)) { + trace_colo_proxy_main_vnet_info("This packet may be load wrong " "pkt->vnet_hdr_len", pkt->vnet_hdr= _len); return 1; } - l2hdr_len =3D eth_get_l2_hdr_length(data); + data +=3D pkt->vnet_hdr_len; =20 - if (pkt->size < ETH_HLEN + pkt->vnet_hdr_len) { - trace_colo_proxy_main("pkt->size < ETH_HLEN"); - return 1; - } + l2hdr_len =3D eth_get_l2_hdr_length(data); =20 /* * TODO: support vlan. diff --git a/net/colo.h b/net/colo.h index 8b3e8d5a83..22fc3031f7 100644 --- a/net/colo.h +++ b/net/colo.h @@ -18,6 +18,7 @@ #include "qemu/jhash.h" #include "qemu/timer.h" #include "net/eth.h" +#include "standard-headers/linux/virtio_net.h" =20 #define HASHTABLE_MAX_SIZE 16384 =20 --=20 2.25.1