From nobody Tue Nov 26 22:34:22 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=1704343013; cv=none; d=zohomail.com; s=zohoarc; b=Ec2kaVGpK6hoR3dhzrx5s4DuHmGGJkRmzRjRTf+lVRVNFCUZ6/bWWx8n2ZT9XMvoIIYXlisv5g8xV6mA1Rlfo/lE7iGvKx4zKeaYVVLvAoBAIjtSUBaMqbHJZE9jKH7t/9tFcDTw+X82AUIv+bJsbp7Mio0lC3HUFwGB9bx3SJw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704343013; h=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=PG5OczbzhFEeu/f0fXXcZOAN8vl5nmE+f4X8lWso424=; b=Fq8+mfFG66K9Vwhsc4nlrNaaBBqrObJ02dv5XJy+x8F3O9Cbb6RvnvR8aWDKGcJ3Yjiq1+uueA07DFJF9e1RnkiIHvpqNEnC+T+iw3Ysrr9Ylx70fnsOWp7En5QL4H+6xosIuFNuHKYSU6LLSHYLk78+fBsUYxcLWy2QL+4RaHw= 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 1704343013156587.5495274203082; Wed, 3 Jan 2024 20:36:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLFRL-0005Cz-BE; Wed, 03 Jan 2024 23:34:43 -0500 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 1rLFRC-0004oE-9X for qemu-devel@nongnu.org; Wed, 03 Jan 2024 23:34:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLFRA-0006lY-K8 for qemu-devel@nongnu.org; Wed, 03 Jan 2024 23:34:34 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-125-xJuENRcjN3mjI5zDkp-PbA-1; Wed, 03 Jan 2024 23:34:28 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3DD5F380673B; Thu, 4 Jan 2024 04:34:28 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1451C1596E; Thu, 4 Jan 2024 04:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704342871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PG5OczbzhFEeu/f0fXXcZOAN8vl5nmE+f4X8lWso424=; b=h+IayVAk/J+ox+J+r91oJ4OjJMnhJREvkdcEKzaN9wenwLTPRqhX8JCv0KLjlU9GAgVAYQ UiQ/y7+Hfz4cIW90S7WoIXlVaZdD7nNsB5pQ2bN9NzLEWU01UAuZMtFjaP4i4UZrEVlUAh mDJ27Ov0c8AW4twu3Rt4EUxS72Ya9s0= X-MC-Unique: xJuENRcjN3mjI5zDkp-PbA-1 From: peterx@redhat.com To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Fabiano Rosas , Steve Sistare , Juan Quintela , peterx@redhat.com, Leonardo Bras Soares Passos , Avihai Horon , Peter Maydell Subject: [PULL 26/26] migration: fix coverity migrate_mode finding Date: Thu, 4 Jan 2024 12:32:11 +0800 Message-ID: <20240104043213.431566-27-peterx@redhat.com> In-Reply-To: <20240104043213.431566-1-peterx@redhat.com> References: <20240104043213.431566-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.601, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1704343014237100001 Content-Type: text/plain; charset="utf-8" From: Steve Sistare Coverity diagnoses a possible out-of-range array index here ... static GSList *migration_blockers[MIG_MODE__MAX]; fill_source_migration_info() { GSList *cur_blocker =3D migration_blockers[migrate_mode()]; ... because it does not know that MIG_MODE__MAX will never be returned as a migration mode. To fix, assert so in migrate_mode(). Fixes: fa3673e497a1 ("migration: per-mode blockers") Reported-by: Peter Maydell Suggested-by: Peter Maydell Signed-off-by: Steve Sistare Reviewed-by: Fabiano Rosas Link: https://lore.kernel.org/r/1699907025-215450-1-git-send-email-steven.s= istare@oracle.com Signed-off-by: Peter Xu --- migration/options.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/options.c b/migration/options.c index 8d8ec73ad9..3e3e0b93b4 100644 --- a/migration/options.c +++ b/migration/options.c @@ -833,8 +833,10 @@ uint64_t migrate_max_postcopy_bandwidth(void) MigMode migrate_mode(void) { MigrationState *s =3D migrate_get_current(); + MigMode mode =3D s->parameters.mode; =20 - return s->parameters.mode; + assert(mode >=3D 0 && mode < MIG_MODE__MAX); + return mode; } =20 int migrate_multifd_channels(void) --=20 2.41.0