From nobody Sat Nov 23 20:23:00 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=1730189430; cv=none; d=zohomail.com; s=zohoarc; b=DaVqD3DXnatmj3+PxePG4qEr5IkXN3qn2c2atYHpvK9S4JmUUTBZD8B42ABnGUMjRyzkmJ88HRM1yko13ZdzGXnPwS77nD+PsZ/MknGS8cEvYcUtmdso19aJltia26twAm404ggQax5vkaDsV3Q3tI4nY2QklTkvgtMTH3qk6Lw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730189430; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZBBmtqtTKH4d7OHrzObTmIJ4MV6c5JVpaNlUUe+FMpA=; b=DCppg+t5XlZDT0THJW+J7mhC5ypbhfrD88BSZfXGGDlhlptTRDkNx0fTU9ZpXr0W4BoRj5wul9b0j8LDvIltdelrlC5A36E3u7goXH4al1iJvlen8DhUbQp1A/FwJ3DHTXV411SC2RP2DFjtLK/Kz2yvNXXVXqmGY/tt3d+5/v4= 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 1730189430330313.4648946656929; Tue, 29 Oct 2024 01:10:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5hGx-00089T-4R; Tue, 29 Oct 2024 04:08:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5hGv-000822-IX for qemu-devel@nongnu.org; Tue, 29 Oct 2024 04:08:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5hGu-00040l-1S for qemu-devel@nongnu.org; Tue, 29 Oct 2024 04:08:13 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-570-o3rpijPDNCiA_F5eTujXrw-1; Tue, 29 Oct 2024 04:08:03 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 90B6E1955F69; Tue, 29 Oct 2024 08:08:02 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.36]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 209F21956086; Tue, 29 Oct 2024 08:07:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730189291; 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=ZBBmtqtTKH4d7OHrzObTmIJ4MV6c5JVpaNlUUe+FMpA=; b=FXF7zWoUQidPOXMlHBFJfxzYcteNATlTCa0QWQenk9aAyLTkAS0jueNg162hvh1OYivTNq fuJEMgATEIE+Xl9gudWzGIlkwUAMsY5fHpVXWrF5alMh/qi+FHva7blIHVAmXcHyQS+eZt tZkcx2oTH51s580TFmHhaQW3qLJZGs4= X-MC-Unique: o3rpijPDNCiA_F5eTujXrw-1 From: Jason Wang To: qemu-devel@nongnu.org Cc: Stefan Weil , qemu-stable@nongnu.org, Zhang Chen , Jason Wang Subject: [PULL 13/14] Fix calculation of minimum in colo_compare_tcp Date: Tue, 29 Oct 2024 16:07:04 +0800 Message-ID: <20241029080705.3238-14-jasowang@redhat.com> In-Reply-To: <20241029080705.3238-1-jasowang@redhat.com> References: <20241029080705.3238-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.373, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1730189431369116600 Content-Type: text/plain; charset="utf-8" From: Stefan Weil GitHub's CodeQL reports a critical error which is fixed by using the MIN ma= cro: Unsigned difference expression compared to zero Signed-off-by: Stefan Weil Cc: qemu-stable@nongnu.org Reviewed-by: Zhang Chen Signed-off-by: Jason Wang --- net/colo-compare.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index c4ad0ab71f..39f90c4065 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -412,8 +412,7 @@ 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 > 0 ? - conn->sack : conn->pack; + uint32_t min_ack =3D MIN(conn->pack, conn->sack); =20 pri: if (g_queue_is_empty(&conn->primary_list)) { --=20 2.42.0