From nobody Sat May 18 22:15:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1637294767505902.1906728193585; Thu, 18 Nov 2021 20:06:07 -0800 (PST) Received: from localhost ([::1]:44486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnvA5-0002Y2-Vu for importer@patchew.org; Thu, 18 Nov 2021 23:06:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnv7x-0000Vl-9V for qemu-devel@nongnu.org; Thu, 18 Nov 2021 23:03:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:48639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnv7u-0006AQ-Mp for qemu-devel@nongnu.org; Thu, 18 Nov 2021 23:03:52 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-244-x1_qXCHpNIatngA1G-4hcw-1; Thu, 18 Nov 2021 23:03:45 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25DD4802C91; Fri, 19 Nov 2021 04:03:44 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-18.pek2.redhat.com [10.72.13.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94B9460BF1; Fri, 19 Nov 2021 04:03:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637294630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O+tB+YFYhuHEBK7CsL9GlmnbNtRTQ7niRop0xvz4Kfc=; b=HPB8WGKLagC1HklJlgtPtUpTWcGLqiskjbbFPIwAnbA72wpE0mqduiunfP+QUX8P2Fq801 QoYQLY4i5CizaVBCnjImmFTF+wyyPbMJKIFg8G/6pWHp+pjoY/qF7Jw1vakYNh69ibtpI+ /z/yT3bY1nli46clWk416STxL0Rr6Bs= X-MC-Unique: x1_qXCHpNIatngA1G-4hcw-1 From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PULL 1/3] net: vmxnet3: validate configuration values during activate (CVE-2021-20203) Date: Fri, 19 Nov 2021 12:03:34 +0800 Message-Id: <20211119040336.14460-2-jasowang@redhat.com> In-Reply-To: <20211119040336.14460-1-jasowang@redhat.com> References: <20211119040336.14460-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Gaoning Pan , Prasad J Pandit Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1637294768945100003 Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit While activating device in vmxnet3_acticate_device(), it does not validate guest supplied configuration values against predefined minimum - maximum limits. This may lead to integer overflow or OOB access issues. Add checks to avoid it. Fixes: CVE-2021-20203 Buglink: https://bugs.launchpad.net/qemu/+bug/1913873 Reported-by: Gaoning Pan Signed-off-by: Prasad J Pandit Signed-off-by: Jason Wang --- hw/net/vmxnet3.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 41f796a..f65af4e 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -1441,6 +1441,7 @@ static void vmxnet3_activate_device(VMXNET3State *s) vmxnet3_setup_rx_filtering(s); /* Cache fields from shared memory */ s->mtu =3D VMXNET3_READ_DRV_SHARED32(d, s->drv_shmem, devRead.misc.mtu= ); + assert(VMXNET3_MIN_MTU <=3D s->mtu && s->mtu < VMXNET3_MAX_MTU); VMW_CFPRN("MTU is %u", s->mtu); =20 s->max_rx_frags =3D @@ -1486,6 +1487,9 @@ static void vmxnet3_activate_device(VMXNET3State *s) /* Read rings memory locations for TX queues */ pa =3D VMXNET3_READ_TX_QUEUE_DESCR64(d, qdescr_pa, conf.txRingBase= PA); size =3D VMXNET3_READ_TX_QUEUE_DESCR32(d, qdescr_pa, conf.txRingSi= ze); + if (size > VMXNET3_TX_RING_MAX_SIZE) { + size =3D VMXNET3_TX_RING_MAX_SIZE; + } =20 vmxnet3_ring_init(d, &s->txq_descr[i].tx_ring, pa, size, sizeof(struct Vmxnet3_TxDesc), false); @@ -1496,6 +1500,9 @@ static void vmxnet3_activate_device(VMXNET3State *s) /* TXC ring */ pa =3D VMXNET3_READ_TX_QUEUE_DESCR64(d, qdescr_pa, conf.compRingBa= sePA); size =3D VMXNET3_READ_TX_QUEUE_DESCR32(d, qdescr_pa, conf.compRing= Size); + if (size > VMXNET3_TC_RING_MAX_SIZE) { + size =3D VMXNET3_TC_RING_MAX_SIZE; + } vmxnet3_ring_init(d, &s->txq_descr[i].comp_ring, pa, size, sizeof(struct Vmxnet3_TxCompDesc), true); VMXNET3_RING_DUMP(VMW_CFPRN, "TXC", i, &s->txq_descr[i].comp_ring); @@ -1537,6 +1544,9 @@ static void vmxnet3_activate_device(VMXNET3State *s) /* RX rings */ pa =3D VMXNET3_READ_RX_QUEUE_DESCR64(d, qd_pa, conf.rxRingBase= PA[j]); size =3D VMXNET3_READ_RX_QUEUE_DESCR32(d, qd_pa, conf.rxRingSi= ze[j]); + if (size > VMXNET3_RX_RING_MAX_SIZE) { + size =3D VMXNET3_RX_RING_MAX_SIZE; + } vmxnet3_ring_init(d, &s->rxq_descr[i].rx_ring[j], pa, size, sizeof(struct Vmxnet3_RxDesc), false); VMW_CFPRN("RX queue %d:%d: Base: %" PRIx64 ", Size: %d", @@ -1546,6 +1556,9 @@ static void vmxnet3_activate_device(VMXNET3State *s) /* RXC ring */ pa =3D VMXNET3_READ_RX_QUEUE_DESCR64(d, qd_pa, conf.compRingBasePA= ); size =3D VMXNET3_READ_RX_QUEUE_DESCR32(d, qd_pa, conf.compRingSize= ); + if (size > VMXNET3_RC_RING_MAX_SIZE) { + size =3D VMXNET3_RC_RING_MAX_SIZE; + } vmxnet3_ring_init(d, &s->rxq_descr[i].comp_ring, pa, size, sizeof(struct Vmxnet3_RxCompDesc), true); VMW_CFPRN("RXC queue %d: Base: %" PRIx64 ", Size: %d", i, pa, size= ); --=20 2.7.4 From nobody Sat May 18 22:15:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1637294775; cv=none; d=zohomail.com; s=zohoarc; b=QK/eSLKr1UgmyEFcZjtsEYnAv4vFyUqBceE/InN2pE87eX437d9qsEHFRmprK4ioT38xkvVebtVE9TGiAwbNHe0SVPoG1YhnCyd5y+7FOUauRTV7u9xd7oyIn7ybsDt1CM+t8pKHaaYdE/rlEcz2fI5JErG/GnS8NZbzpBiCiM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637294775; h=Content-Type:Content-Transfer-Encoding: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=NSNqzMdiYd1AqcnEVTVw0nNmp24RCW0UjMdkXR+jmI8=; b=EFOSlqcasa6Xcr/p0v57LuseEz6FY58dVjyefvlCDnStRJY+pehujSHRXTBEiSlrcDq0tlICygxOYBGhNrqXLeYN3O8Sa1M7nl1uzRTE47k4kV8MQjBcPUY1rqhQUBb4t8jrBh75YKww5kIr9tbJdyQm4FQt395okGCj7QqfpiI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 1637294775681912.0890775825465; Thu, 18 Nov 2021 20:06:15 -0800 (PST) Received: from localhost ([::1]:44622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnvAE-0002dX-LL for importer@patchew.org; Thu, 18 Nov 2021 23:06:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnv7y-0000Z6-R5 for qemu-devel@nongnu.org; Thu, 18 Nov 2021 23:03:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnv7v-0006Aa-VW for qemu-devel@nongnu.org; Thu, 18 Nov 2021 23:03:54 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-499-_0mhWNoXPA-pjKG-CXMGVQ-1; Thu, 18 Nov 2021 23:03:47 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8CF86802C91; Fri, 19 Nov 2021 04:03:46 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-18.pek2.redhat.com [10.72.13.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8BDF60BF1; Fri, 19 Nov 2021 04:03:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637294631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NSNqzMdiYd1AqcnEVTVw0nNmp24RCW0UjMdkXR+jmI8=; b=Lg4mr/JrDb9g2dKhCWBY+PTHYBtuTFYAW9v3FyvQMzUJ5tf7XiMXH/J3XyR5H7emfig6Yj VroFv7N0q0+NblXiNvcnpqzGUNuHLbgzfO9KJlDG6a1wx5SPvZj53/ovT0kIFRCswQG688 YDWDtRNK+o/ZoNH0j91JmIqq4IWwmw0= X-MC-Unique: _0mhWNoXPA-pjKG-CXMGVQ-1 From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PULL 2/3] net/colo-compare.c: Fix ACK track reverse issue Date: Fri, 19 Nov 2021 12:03:35 +0800 Message-Id: <20211119040336.14460-3-jasowang@redhat.com> In-Reply-To: <20211119040336.14460-1-jasowang@redhat.com> References: <20211119040336.14460-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen , Jason Wang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637294777022100001 Content-Type: text/plain; charset="utf-8" From: Zhang Chen The TCP protocol ACK maybe bigger than uint32_t MAX. At this time, the ACK will reverse to 0. This patch fix the max_ack and min_ack track issue. Signed-off-by: Zhang Chen Signed-off-by: Jason Wang --- net/colo-compare.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index b8876d7..1225f40 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -209,7 +209,8 @@ static void fill_pkt_tcp_info(void *data, uint32_t *max= _ack) =20 pkt->tcp_seq =3D ntohl(tcphd->th_seq); pkt->tcp_ack =3D ntohl(tcphd->th_ack); - *max_ack =3D *max_ack > pkt->tcp_ack ? *max_ack : pkt->tcp_ack; + /* Need to consider ACK will bigger than uint32_t MAX */ + *max_ack =3D pkt->tcp_ack - *max_ack > 0 ? pkt->tcp_ack : *max_ack; pkt->header_size =3D pkt->transport_header - (uint8_t *)pkt->data + (tcphd->th_off << 2); pkt->payload_size =3D pkt->size - pkt->header_size; @@ -413,7 +414,8 @@ static void colo_compare_tcp(CompareState *s, Connectio= n *conn) * can ensure that the packet's payload is acknowledged by * primary and secondary. */ - uint32_t min_ack =3D conn->pack > conn->sack ? conn->sack : conn->pack; + uint32_t min_ack =3D conn->pack - conn->sack > 0 ? + conn->sack : conn->pack; =20 pri: if (g_queue_is_empty(&conn->primary_list)) { --=20 2.7.4 From nobody Sat May 18 22:15:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1637294902; cv=none; d=zohomail.com; s=zohoarc; b=VkovgWT57/zGB59KctVnK5tI+oEl01mW09FQxcB4OlHC2danSKH2x2MGnVimnGG45fW3fIvjyn0zjDKpA/nmSArpibKBCGfSQaKktvsFR/W6pIKUJVXzOfhoBlujiXMMy/R/ICbg1lm3XWuRQtN0rz9PT6n1t7oRvMkaY9O31/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637294902; h=Content-Type:Content-Transfer-Encoding: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=RUDN9BM9JKMzh4bzsDUnOA725hqQKT4s96FHXKw7UeI=; b=Kon/088FNJdOAS7ue4g3r4IXoTqrwbFVpWw7xMO9AbJUygS70zeV2FXXxdknP7WPa0EkOncReQjEqEJlkR7uVG2NyFGJoR1dmFmhc1O9mf5omxczDaK5xKdN9drqaSlf7gFjRGH46sm1NTxYgSYgvYu3tn9chCyLKe/JqF9TFbE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 1637294902559687.581507399221; Thu, 18 Nov 2021 20:08:22 -0800 (PST) Received: from localhost ([::1]:48890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnvCH-0005af-GQ for importer@patchew.org; Thu, 18 Nov 2021 23:08:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnv7y-0000ZC-Sg for qemu-devel@nongnu.org; Thu, 18 Nov 2021 23:03:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:38647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnv7x-0006B2-20 for qemu-devel@nongnu.org; Thu, 18 Nov 2021 23:03:54 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-256---Fbfp4KNKy7YHESYXb-Pg-1; Thu, 18 Nov 2021 23:03:50 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE03B18125C0; Fri, 19 Nov 2021 04:03:49 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-18.pek2.redhat.com [10.72.13.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21D5F60BF1; Fri, 19 Nov 2021 04:03:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637294632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RUDN9BM9JKMzh4bzsDUnOA725hqQKT4s96FHXKw7UeI=; b=C2NRpRm6h2ByReBkFwd9TQfR8/YcLJhZWXMgz/EHTAoJ8x+cAX70d1UswZ0gURKWc5I/KY uuziYNUywWvfZhbVKk7FCw/KrtmRe/IPHEbWw4LA1wNa38FsZC6MRFv26/l35PGaMc8R0M E3gEs6oyEhpSc5OOSKhSZbRGuvNPXGs= X-MC-Unique: --Fbfp4KNKy7YHESYXb-Pg-1 From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PULL 3/3] net/colo-compare.c: Fix incorrect return when input wrong size Date: Fri, 19 Nov 2021 12:03:36 +0800 Message-Id: <20211119040336.14460-4-jasowang@redhat.com> In-Reply-To: <20211119040336.14460-1-jasowang@redhat.com> References: <20211119040336.14460-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen , Jason Wang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637294904079100001 Content-Type: text/plain; charset="utf-8" From: Zhang Chen Signed-off-by: Zhang Chen Signed-off-by: Jason Wang --- net/colo-compare.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 1225f40..b966e7e 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -807,7 +807,7 @@ static int compare_chr_send(CompareState *s, } =20 if (!size) { - return 0; + return -1; } =20 entry =3D g_slice_new(SendEntry); --=20 2.7.4