From nobody Sun May 19 16:31:32 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 ARC-Seal: i=1; a=rsa-sha256; t=1589516649; cv=none; d=zohomail.com; s=zohoarc; b=RZxNnSZr64xnGUmROG9PuO7EWSo9RxyRoSOrQozdQgm9rIVbKBY2o487YRWlhLPAMWJBhmheXucsoedjRWFPHKIEWmFgBOfEW+4desQaykB8J6O2vYsuJhvpkTZfgl+OH/NFxiTH/RuT8ZtdGbpAjvEotIsL2kMUdgaLu0kvSPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589516649; h=Content-Type: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=rnGy+nbz/6ihpYM8xij3AfZs61Auhjg0iER1EhIdf0Q=; b=ZbPYFmjJsvVMlz5pQ+5a4lslgE/91pViY2OLql3WW8cFMP4yLm6Ju/BOSkC38r1DjUl5M5fmcojAII2AeB1TgIrGRVPRMhd0d8TX33CT4GOprzu8baq6tVOgEIzv6qDUCtrDcZCkz9ThbGwB7QeElpBeMxdJ/o+UJVKzhmaHGVo= ARC-Authentication-Results: i=1; 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 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 1589516649284932.8631945337638; Thu, 14 May 2020 21:24:09 -0700 (PDT) Received: from localhost ([::1]:55196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZRtG-0006a5-7c for importer@patchew.org; Fri, 15 May 2020 00:24:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZRrr-00068p-5v for qemu-devel@nongnu.org; Fri, 15 May 2020 00:22:39 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:23511 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jZRrq-00011x-3w for qemu-devel@nongnu.org; Fri, 15 May 2020 00:22:38 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-288-h_m7paTfMmWmUlrGenbyQA-1; Fri, 15 May 2020 00:22:34 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 62F1C460; Fri, 15 May 2020 04:22:33 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1BB7B5D9D7; Fri, 15 May 2020 04:22:33 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9E11E11358BC; Fri, 15 May 2020 06:22:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589516557; 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; bh=rnGy+nbz/6ihpYM8xij3AfZs61Auhjg0iER1EhIdf0Q=; b=FrMoaC1oiY8BHsgMnh6OB4w2r1tJitYKgM6yYL2qlMOlrQNRII5g4gvz5tSumjJQBHd2yh /ObVzSpLMGeJXChMnVqcuR9YAZDlieTcArAlwGLS1153SwkcHNfBWebCGhO/2ccpd4pioj nEjESQgQowivO7FE4rdwHuJP6ymYoeI= X-MC-Unique: h_m7paTfMmWmUlrGenbyQA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2] cpus: Fix botched configure_icount() error API violation fix Date: Fri, 15 May 2020 06:22:31 +0200 Message-Id: <20200515042231.18201-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/15 00:07:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, 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_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: pbonzini@redhat.com, philmd@redhat.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Before recent commit abc9bf69a66, configure_icount() returned early when option "shift" was absent: succeed when option "align" was also absent, else fail. Since then, it still errors out when only "align" is present, but continues when both are absent. Crashes when examining the value of "shift" further. Reproducer: -icount "". Revert this erroneous part of the commit. Fixes: abc9bf69a66a11499a801ff545b8fe7adbb3a04c Fixes: Coverity CID 1428754 Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- cpus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cpus.c b/cpus.c index 5670c96bcf..ee906dd08f 100644 --- a/cpus.c +++ b/cpus.c @@ -803,8 +803,10 @@ void configure_icount(QemuOpts *opts, Error **errp) bool align =3D qemu_opt_get_bool(opts, "align", false); long time_shift =3D -1; =20 - if (!option && qemu_opt_get(opts, "align")) { - error_setg(errp, "Please specify shift option when using align"); + if (!option) { + if (qemu_opt_get(opts, "align") !=3D NULL) { + error_setg(errp, "Please specify shift option when using align= "); + } return; } =20 --=20 2.21.1